react-native-ios-widget 0.0.13-beta.3 → 0.0.13-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ios-widget",
-  "version": "0.0.13-beta.3",
+  "version": "0.0.13-beta.4",
   "description": "Expo config plugin to add widgets to a React Native app",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/plugin/build/index.js

@@ -5,7 +5,6 @@ const withXcode_1 = require("./withXcode");
 const withWidgetExtensionEntitlements_1 = require("./withWidgetExtensionEntitlements");
 const withPodfile_1 = require("./withPodfile");
 const withConfig_1 = require("./withConfig");
-const withWidgetModuleConfig_1 = require("./withWidgetModuleConfig");
 const withWidget = (config, { enabled = true, deploymentTarget = "14.0", widgetsFolder = "widgets", groupIdentifier, pods = [], targetName = "WidgetsExtension", bundleIdentifier = `${config.ios?.bundleIdentifier}.Widgets`, }) => {
     const widget = {
         enabled,
@@ -21,7 +20,6 @@ const withWidget = (config, { enabled = true, deploymentTarget = "14.0", widgets
         [withWidgetExtensionEntitlements_1.withWidgetExtensionEntitlements, widget],
         [withPodfile_1.withPodfile, widget],
         [withConfig_1.withConfig, widget],
-        [withWidgetModuleConfig_1.withWidgetModuleConfig, widget],
     ]);
 };
 exports.default = withWidget;

package/plugin/build/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/index.ts","../src/types.ts","../src/withconfig.ts","../src/withpodfile.ts","../src/withwidgetextensionentitlements.ts","../src/withwidgetmoduleconfig.ts","../src/withxcode.ts","../src/lib/getwidgetextensionentitlements.ts","../src/lib/getwidgetfiles.ts","../src/xcode/addbuildphases.ts","../src/xcode/addpbxgroup.ts","../src/xcode/addproductfile.ts","../src/xcode/addtargetdependency.ts","../src/xcode/addtopbxnativetargetsection.ts","../src/xcode/addtopbxprojectsection.ts","../src/xcode/addxcconfigurationlist.ts"],"errors":true,"version":"5.9.3"}
+{"root":["../src/index.ts","../src/types.ts","../src/withconfig.ts","../src/withpodfile.ts","../src/withwidgetextensionentitlements.ts","../src/withxcode.ts","../src/lib/getwidgetextensionentitlements.ts","../src/lib/getwidgetfiles.ts","../src/xcode/addbuildphases.ts","../src/xcode/addpbxgroup.ts","../src/xcode/addproductfile.ts","../src/xcode/addtargetdependency.ts","../src/xcode/addtopbxnativetargetsection.ts","../src/xcode/addtopbxprojectsection.ts","../src/xcode/addxcconfigurationlist.ts"],"version":"5.9.3"}

package/plugin/build/withXcode.js

@@ -46,87 +46,78 @@ const addPbxGroup_1 = require("./xcode/addPbxGroup");
 const addBuildPhases_1 = require("./xcode/addBuildPhases");
 const getWidgetFiles_1 = require("./lib/getWidgetFiles");
 const withXcode = (config, { enabled, targetName, bundleIdentifier, deploymentTarget, widgetsFolder }) => {
-    return (0, config_plugins_1.withDangerousMod)(config, [
-        "ios",
-        (config) => {
-            const { platformProjectRoot, projectRoot } = config.modRequest;
-            const widgetsPath = path.join(projectRoot, widgetsFolder);
-            const moduleRoot = path.join(projectRoot, "node_modules", "react-native-ios-widget", "ios");
-            if (!enabled) {
-                ensureModuleSwift(widgetsPath, moduleRoot);
-                return config;
-            }
-            const targetPath = path.join(platformProjectRoot, targetName);
-            const widgetFiles = (0, getWidgetFiles_1.getWidgetFiles)(widgetsPath, targetPath, moduleRoot);
-            const xcodeProject = config.modResults;
-            const marketingVersion = config.version;
-            const xCConfigurationList = (0, addXCConfigurationList_1.addXCConfigurationList)(xcodeProject, {
-                targetName,
-                currentProjectVersion: config.ios.buildNumber || "1",
-                bundleIdentifier,
-                deploymentTarget,
-                marketingVersion,
-            });
-            const groupName = "Embed Foundation Extensions";
-            const productFile = (0, addProductFile_1.addProductFile)(xcodeProject, {
-                targetName,
-                groupName,
-            });
-            const targetUuid = xcodeProject.generateUuid();
-            const target = (0, addToPbxNativeTargetSection_1.addToPbxNativeTargetSection)(xcodeProject, {
-                targetName,
-                targetUuid,
-                productFile,
-                xCConfigurationList,
-            });
-            (0, addToPbxProjectSection_1.addToPbxProjectSection)(xcodeProject, target);
-            (0, addTargetDependency_1.addTargetDependency)(xcodeProject, target);
-            (0, addBuildPhases_1.addBuildPhases)(xcodeProject, {
-                targetUuid,
-                groupName,
-                productFile,
-                widgetFiles,
-            });
-            (0, addPbxGroup_1.addPbxGroup)(xcodeProject, {
-                targetName,
-                widgetFiles,
-            });
+    return (0, config_plugins_1.withXcodeProject)(config, (config) => {
+        const { platformProjectRoot, projectRoot } = config.modRequest;
+        const widgetsPath = path.join(projectRoot, widgetsFolder);
+        const moduleRoot = path.join(projectRoot, "node_modules", "react-native-ios-widget", "ios");
+        if (!enabled) {
+            ensureModuleSwift(widgetsPath, moduleRoot);
             return config;
         }
-    ]);
+        const targetPath = path.join(platformProjectRoot, targetName);
+        const widgetFiles = (0, getWidgetFiles_1.getWidgetFiles)(widgetsPath, targetPath, moduleRoot);
+        const xcodeProject = config.modResults;
+        const marketingVersion = config.version;
+        const xCConfigurationList = (0, addXCConfigurationList_1.addXCConfigurationList)(xcodeProject, {
+            targetName,
+            currentProjectVersion: config.ios.buildNumber || "1",
+            bundleIdentifier,
+            deploymentTarget,
+            marketingVersion,
+        });
+        const groupName = "Embed Foundation Extensions";
+        const productFile = (0, addProductFile_1.addProductFile)(xcodeProject, {
+            targetName,
+            groupName,
+        });
+        const targetUuid = xcodeProject.generateUuid();
+        const target = (0, addToPbxNativeTargetSection_1.addToPbxNativeTargetSection)(xcodeProject, {
+            targetName,
+            targetUuid,
+            productFile,
+            xCConfigurationList,
+        });
+        (0, addToPbxProjectSection_1.addToPbxProjectSection)(xcodeProject, target);
+        (0, addTargetDependency_1.addTargetDependency)(xcodeProject, target);
+        (0, addBuildPhases_1.addBuildPhases)(xcodeProject, {
+            targetUuid,
+            groupName,
+            productFile,
+            widgetFiles,
+        });
+        (0, addPbxGroup_1.addPbxGroup)(xcodeProject, {
+            targetName,
+            widgetFiles,
+        });
+        return config;
+    });
 };
 exports.withXcode = withXcode;
 const ensureModuleSwift = (widgetsPath, moduleRoot) => {
-    // Ensure pod source dir exists for Module.swift.
+    // Ensure the pod source dir exists for Module.swift.
     if (!fs.existsSync(moduleRoot)) {
         fs.mkdirSync(moduleRoot, { recursive: true });
     }
-    // Conditionally manage expo-module.config.json based on widget enabled state.
-    // When widgets are enabled, ensure module config exists and declares ReactNativeWidgetExtensionModule.
-    // When disabled, remove or write empty config to exclude module from Expo autolinking.
-    const moduleConfigPath = path.join(moduleRoot, "expo-module.config.json");
+    // Prefer the real Module.swift from widgets if it exists.
     const moduleSwiftPath = path.join(widgetsPath, "Module.swift");
     const targetPath = path.join(moduleRoot, "Module.swift");
     if (fs.existsSync(moduleSwiftPath)) {
-        // Widgets enabled: copy real Module.swift for CocoaPods
         fs.copyFileSync(moduleSwiftPath, targetPath);
-        // Write module config to enable Expo autolinking
-        const moduleConfig = {
-            platforms: ["ios"],
-            ios: {
-                modules: ["ReactNativeWidgetExtensionModule"],
-            },
-        };
-        if (!fs.existsSync(moduleConfigPath)) {
-            fs.writeFileSync(moduleConfigPath, JSON.stringify(moduleConfig, null, 2));
-        }
+        return;
     }
-    else {
-        // Widgets disabled: ensure no module config exists (remove empty config if present)
-        if (fs.existsSync(moduleConfigPath)) {
-            fs.unlinkSync(moduleConfigPath);
-        }
-        // Write empty config to exclude module from Expo autolinking
-        fs.writeFileSync(moduleConfigPath, JSON.stringify({ platforms: ["ios"], ios: {} }, null, 2));
+    // If widgets are disabled and no real Module.swift exists, write a stub
+    // so CocoaPods still builds a Swift module and avoids import errors.
+    if (!fs.existsSync(targetPath)) {
+        const stubModule = [
+            "import ExpoModulesCore",
+            "",
+            "public class ReactNativeWidgetExtensionModule: Module {",
+            "  public func definition() -> ModuleDefinition {",
+            '    Name("ReactNativeWidgetExtension")',
+            "  }",
+            "}",
+            "",
+        ].join("\n");
+        fs.writeFileSync(targetPath, stubModule);
     }
 };

package/plugin/build/withWidgetModuleConfig.d.ts

@@ -1,3 +0,0 @@
-import { ConfigPlugin } from "expo/config-plugins";
-import { WidgetConfig } from "./types";
-export declare const withWidgetModuleConfig: ConfigPlugin<Required<WidgetConfig>>;

package/plugin/build/withWidgetModuleConfig.js

@@ -1,85 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withWidgetModuleConfig = void 0;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const withWidgetModuleConfig = (config, { enabled, targetName, widgetsFolder }) => {
-    const { platformProjectRoot, projectRoot } = config.modRequest;
-    const widgetsPath = path.join(projectRoot, widgetsFolder);
-    const moduleRoot = path.join(projectRoot, "node_modules", "react-native-ios-widget", "ios");
-    if (!enabled) {
-        // When disabled, ensure no module config exists (remove if present)
-        const moduleConfigPath = path.join(moduleRoot, "expo-module.config.json");
-        if (fs.existsSync(moduleConfigPath)) {
-            fs.unlinkSync(moduleConfigPath);
-        }
-        // Optionally write empty config to explicitly exclude module
-        // fs.writeFileSync(
-        //   moduleConfigPath,
-        //   JSON.stringify({ platforms: ["ios"], ios: {} }, null, 2)
-        // );
-    }
-    // Conditionally manage expo-module.config.json based on widget enabled state.
-    // When widgets are enabled, ensure module config exists and declares ReactNativeWidgetExtensionModule.
-    // When disabled, remove or write empty config to exclude module from Expo autolinking.
-    const moduleConfigPath = path.join(moduleRoot, "expo-module.config.json");
-    const moduleSwiftPath = path.join(widgetsPath, "Module.swift");
-    const targetPath = path.join(moduleRoot, "Module.swift");
-    if (fs.existsSync(moduleSwiftPath)) {
-        // Widgets enabled: copy real Module.swift for CocoaPods
-        fs.copyFileSync(moduleSwiftPath, targetPath);
-        // Write module config to enable Expo autolinking
-        const moduleConfig = {
-            platforms: ["ios"],
-            ios: {
-                modules: ["ReactNativeWidgetExtensionModule"],
-            },
-        };
-        if (!fs.existsSync(moduleConfigPath)) {
-            fs.writeFileSync(moduleConfigPath, JSON.stringify(moduleConfig, null, 2));
-        }
-    }
-    else {
-        // Widgets disabled: ensure no module config exists (remove empty config if present)
-        if (fs.existsSync(moduleConfigPath)) {
-            fs.unlinkSync(moduleConfigPath);
-        }
-        // Write empty config to exclude module from Expo autolinking
-        fs.writeFileSync(moduleConfigPath, JSON.stringify({ platforms: ["ios"], ios: {} }, null, 2));
-    }
-    return config;
-};
-exports.withWidgetModuleConfig = withWidgetModuleConfig;