@capacitor-plus/cli 8.3.2 → 8.3.3

package/dist/ios/update.js

@@ -100,6 +100,18 @@ function buildBinaryTargetEntries(p, frameworks) {
         .join('');
     return { binaryTargetsText, binaryDepsText };
 }
+function buildResourcesText(resources) {
+    const resourceEntry = [];
+    for (const resource of resources) {
+        resourceEntry.push(`.copy("resources/${resource.$.src.split('/').pop()}")`);
+    }
+    return resources.length > 0
+        ? `,
+            resources: [
+                ${resourceEntry.join(',\n                ')}
+            ]`
+        : '';
+}
 function buildCSettingsText(p, sourceFiles) {
     var _a;
     const pluginId = p.id;
@@ -155,8 +167,9 @@ async function writeGeneratedPackageSwift(p, config, iosPlatformVersion) {
         ? `,
             publicHeadersPath: "."`
         : '';
+    const resources = (0, plugin_1.getPlatformElement)(p, platform, 'resource-file');
     const sourceFiles = (0, plugin_1.getPlatformElement)(p, platform, 'source-file');
-    if (sourceFiles.length === 0 && headerFiles.length === 0) {
+    if (sourceFiles.length === 0 && headerFiles.length === 0 && resources.length === 0) {
         return;
     }
     const frameworks = (0, plugin_1.getPlatformElement)(p, platform, 'framework');
@@ -165,6 +178,7 @@ async function writeGeneratedPackageSwift(p, config, iosPlatformVersion) {
     const systemFrameworks = frameworks.filter((f) => !f.$.custom && f.$.src.endsWith('.framework'));
     const hasWeakFrameworks = systemFrameworks.some((f) => f.$.weak === 'true');
     const requiredSystemFrameworks = systemFrameworks.filter((f) => f.$.weak !== 'true');
+    const resourcesText = buildResourcesText(resources);
     const libraryTypeText = hasWeakFrameworks ? `\n            type: .dynamic,` : '';
     const linkerSettingsText = requiredSystemFrameworks.length > 0
         ? `,
@@ -194,7 +208,7 @@ let package = Package(
             dependencies: [
                 .product(name: "Cordova", package: "capacitor-swift-pm")${binaryDepsText}
             ],
-            path: "."${headersText}${cSettingsText}${linkerSettingsText}
+            path: "."${resourcesText}${headersText}${cSettingsText}${linkerSettingsText}
         )${binaryTargetsText}
     ]
 )`;
@@ -505,8 +519,13 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
                     }
                     if (fileContent.includes('[NSBundle bundleForClass:[self class]]') ||
                         fileContent.includes('[NSBundle bundleForClass:[CDVCapture class]]')) {
-                        fileContent = fileContent.replace('[NSBundle bundleForClass:[self class]]', '[NSBundle mainBundle]');
-                        fileContent = fileContent.replace('[NSBundle bundleForClass:[CDVCapture class]]', '[NSBundle mainBundle]');
+                        const bundleName = isSPM ? 'SWIFTPM_MODULE_BUNDLE' : '[NSBundle mainBundle]';
+                        fileContent = fileContent.replace('[NSBundle bundleForClass:[self class]]', bundleName);
+                        fileContent = fileContent.replace('[NSBundle bundleForClass:[CDVCapture class]]', bundleName);
+                        await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
+                    }
+                    if (isSPM && fileContent.includes('[NSBundle mainBundle] URLForResource')) {
+                        fileContent = fileContent.replace('[NSBundle mainBundle] URLForResource', 'SWIFTPM_MODULE_BUNDLE URLForResource');
                         await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
                     }
                     if (fileContent.includes('[self.webView superview]') || fileContent.includes('self.webView.superview')) {
@@ -520,7 +539,8 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
         const resourceFiles = (0, plugin_1.getPlatformElement)(p, platform, 'resource-file');
         for (const resourceFile of resourceFiles) {
             const fileName = resourceFile.$.src.split('/').pop();
-            await (0, fs_extra_1.copy)((0, plugin_1.getFilePath)(config, p, resourceFile.$.src), (0, path_1.join)(config.ios.cordovaPluginsDirAbs, 'resources', fileName));
+            const rootResFolder = isSPM ? sourcesFolder : config.ios.cordovaPluginsDirAbs;
+            await (0, fs_extra_1.copy)((0, plugin_1.getFilePath)(config, p, resourceFile.$.src), (0, path_1.join)(rootResFolder, 'resources', fileName));
         }
         for (const framework of frameworks) {
             if (framework.$.custom && framework.$.custom === 'true') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-plus/cli",
-  "version": "8.3.2",
+  "version": "8.3.3",
   "description": "Capacitor+: Enhanced Capacitor with automated upstream sync - Cross-platform apps with JavaScript and the web",
   "homepage": "https://capgo.app/docs/plugins/capacitor-plus/",
   "author": "Capgo Team <support@capgo.app> (https://capgo.app)",