react-native-ios-widget 0.0.6 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ios-widget",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "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.d.ts

@@ -1,10 +1,4 @@
 import { ConfigPlugin } from "expo/config-plugins";
-declare const withWidget: ConfigPlugin<{
-    enabled?: boolean;
-    widgetsFolder?: string;
-    deploymentTarget?: string;
-    groupIdentifier?: string;
-    pods?: string[];
-    widgetName: string;
-}>;
+import { WidgetPluginProps } from "./types";
+declare const withWidget: ConfigPlugin<WidgetPluginProps>;
 export default withWidget;

package/plugin/build/index.js

@@ -5,25 +5,21 @@ const withXcode_1 = require("./withXcode");
 const withWidgetExtensionEntitlements_1 = require("./withWidgetExtensionEntitlements");
 const withPodfile_1 = require("./withPodfile");
 const withConfig_1 = require("./withConfig");
-const withWidget = (config, { enabled = true, deploymentTarget = "14.0", widgetsFolder = "widgets", groupIdentifier, pods, }) => {
-    if (!enabled) {
-        return config;
-    }
-    const targetName = "WidgetsExtension";
-    const bundleIdentifier = `${config.ios?.bundleIdentifier}.Widgets`;
+const withWidget = (config, { enabled = true, deploymentTarget = "14.0", widgetsFolder = "widgets", groupIdentifier, pods = [], targetName = "WidgetsExtension", bundleIdentifier = `${config.ios?.bundleIdentifier}.Widgets`, }) => {
+    const props = {
+        enabled,
+        deploymentTarget,
+        widgetsFolder,
+        groupIdentifier,
+        pods,
+        targetName,
+        bundleIdentifier,
+    };
     return (0, config_plugins_1.withPlugins)(config, [
-        [
-            withXcode_1.withXcode,
-            {
-                targetName,
-                bundleIdentifier,
-                deploymentTarget,
-                widgetsFolder,
-            },
-        ],
-        [withWidgetExtensionEntitlements_1.withWidgetExtensionEntitlements, { targetName, groupIdentifier }],
-        [withPodfile_1.withPodfile, { targetName, pods }],
-        [withConfig_1.withConfig, { targetName, bundleIdentifier, groupIdentifier }],
+        [withXcode_1.withXcode, props],
+        [withWidgetExtensionEntitlements_1.withWidgetExtensionEntitlements, props],
+        [withPodfile_1.withPodfile, props],
+        [withConfig_1.withConfig, props],
     ]);
 };
 exports.default = withWidget;

package/plugin/build/lib/getWidgetFiles.js

@@ -70,6 +70,9 @@ function getWidgetFiles(widgetsPath, targetPath) {
         const source = path.join(widgetsPath, file);
         copyFileSync(source, targetPath);
     });
+    // Copy Module.swift and Attributes.swift
+    const modulePath = path.join(__dirname, "../../../ios");
+    copyFileSync(path.join(widgetsPath, "Module.swift"), path.join(modulePath, "Module.swift"));
     // Copy directories
     widgetFiles.assetDirectories.forEach((directory) => {
         const imagesXcassetsSource = path.join(widgetsPath, directory);

package/plugin/build/types.d.ts

@@ -0,0 +1,9 @@
+export interface WidgetPluginProps {
+    enabled?: boolean;
+    widgetsFolder?: string;
+    deploymentTarget?: string;
+    groupIdentifier: string;
+    pods?: string[];
+    targetName?: string;
+    bundleIdentifier?: string;
+}

package/plugin/build/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/plugin/build/withConfig.d.ts

@@ -1,6 +1,3 @@
 import { ConfigPlugin } from "expo/config-plugins";
-export declare const withConfig: ConfigPlugin<{
-    bundleIdentifier: string;
-    targetName: string;
-    groupIdentifier?: string;
-}>;
+import { WidgetPluginProps } from "./types";
+export declare const withConfig: ConfigPlugin<Required<WidgetPluginProps>>;

package/plugin/build/withConfig.js

@@ -2,7 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withConfig = void 0;
 const getWidgetExtensionEntitlements_1 = require("./lib/getWidgetExtensionEntitlements");
-const withConfig = (config, { bundleIdentifier, targetName, groupIdentifier }) => {
+const withConfig = (config, { enabled, groupIdentifier, targetName, bundleIdentifier }) => {
+    if (!enabled) {
+        return config;
+    }
     let configIndex = null;
     config.extra?.eas?.build?.experimental?.ios?.appExtensions?.forEach((ext, index) => {
         if (ext.targetName === targetName) {

package/plugin/build/withPodfile.d.ts

@@ -1,5 +1,3 @@
 import { ConfigPlugin } from "expo/config-plugins";
-export declare const withPodfile: ConfigPlugin<{
-    targetName: string;
-    pods?: string[];
-}>;
+import { WidgetPluginProps } from "./types";
+export declare const withPodfile: ConfigPlugin<Required<WidgetPluginProps>>;

package/plugin/build/withPodfile.js

@@ -28,7 +28,10 @@ const generateCode_1 = require("@expo/config-plugins/build/utils/generateCode");
 const config_plugins_1 = require("expo/config-plugins");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const withPodfile = (config, { targetName, pods = [] }) => {
+const withPodfile = (config, { enabled, targetName, pods }) => {
+    if (!enabled) {
+        return config;
+    }
     return (0, config_plugins_1.withDangerousMod)(config, [
         "ios",
         (config) => {

package/plugin/build/withWidgetExtensionEntitlements.d.ts

@@ -1,7 +1,3 @@
 import { ConfigPlugin } from "expo/config-plugins";
-export declare const withWidgetExtensionEntitlements: ConfigPlugin<{
-    targetName: string;
-    targetPath: string;
-    groupIdentifier: string;
-    appleSignin: boolean;
-}>;
+import { WidgetPluginProps } from "./types";
+export declare const withWidgetExtensionEntitlements: ConfigPlugin<Required<WidgetPluginProps>>;

package/plugin/build/withWidgetExtensionEntitlements.js

@@ -32,7 +32,10 @@ const config_plugins_1 = require("expo/config-plugins");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const getWidgetExtensionEntitlements_1 = require("./lib/getWidgetExtensionEntitlements");
-const withWidgetExtensionEntitlements = (config, { targetName, groupIdentifier }) => {
+const withWidgetExtensionEntitlements = (config, { enabled, targetName, groupIdentifier }) => {
+    if (!enabled) {
+        return config;
+    }
     return (0, config_plugins_1.withInfoPlist)(config, (config) => {
         const targetPath = path.join(config.modRequest.platformProjectRoot, targetName);
         const filePath = path.join(targetPath, `${targetName}.entitlements`);

package/plugin/build/withXcode.d.ts

@@ -1,7 +1,3 @@
 import { ConfigPlugin } from "expo/config-plugins";
-export declare const withXcode: ConfigPlugin<{
-    targetName: string;
-    bundleIdentifier: string;
-    deploymentTarget: string;
-    widgetsFolder: string;
-}>;
+import { WidgetPluginProps } from "./types";
+export declare const withXcode: ConfigPlugin<Required<WidgetPluginProps>>;

package/plugin/build/withXcode.js

@@ -34,16 +34,17 @@ const addTargetDependency_1 = require("./xcode/addTargetDependency");
 const addPbxGroup_1 = require("./xcode/addPbxGroup");
 const addBuildPhases_1 = require("./xcode/addBuildPhases");
 const getWidgetFiles_1 = require("./lib/getWidgetFiles");
-const withXcode = (config, { targetName, bundleIdentifier, deploymentTarget, widgetsFolder }) => {
+const withXcode = (config, { enabled, targetName, bundleIdentifier, deploymentTarget, widgetsFolder }) => {
     return (0, config_plugins_1.withXcodeProject)(config, (config) => {
-        const xcodeProject = config.modResults;
-        const widgetsPath = path.join(config.modRequest.projectRoot, widgetsFolder);
-        const targetUuid = xcodeProject.generateUuid();
-        const groupName = "Embed Foundation Extensions";
-        const { platformProjectRoot } = config.modRequest;
-        const marketingVersion = config.version;
+        const { platformProjectRoot, projectRoot } = config.modRequest;
+        const widgetsPath = path.join(projectRoot, widgetsFolder);
         const targetPath = path.join(platformProjectRoot, targetName);
         const widgetFiles = (0, getWidgetFiles_1.getWidgetFiles)(widgetsPath, targetPath);
+        if (!enabled) {
+            return config;
+        }
+        const xcodeProject = config.modResults;
+        const marketingVersion = config.version;
         const xCConfigurationList = (0, addXCConfigurationList_1.addXCConfigurationList)(xcodeProject, {
             targetName,
             currentProjectVersion: config.ios.buildNumber || "1",
@@ -51,10 +52,12 @@ const withXcode = (config, { targetName, bundleIdentifier, deploymentTarget, wid
             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,

package/plugin/src/index.ts

@@ -3,44 +3,35 @@ import { withXcode } from "./withXcode";
 import { withWidgetExtensionEntitlements } from "./withWidgetExtensionEntitlements";
 import { withPodfile } from "./withPodfile";
 import { withConfig } from "./withConfig";
+import { WidgetPluginProps } from "./types";
 
-const withWidget: ConfigPlugin<{
-  enabled?: boolean;
-  widgetsFolder?: string;
-  deploymentTarget?: string;
-  groupIdentifier?: string;
-  pods?: string[];
-  widgetName: string;
-}> = (
+const withWidget: ConfigPlugin<WidgetPluginProps> = (
   config,
   {
     enabled = true,
     deploymentTarget = "14.0",
     widgetsFolder = "widgets",
     groupIdentifier,
-    pods,
+    pods = [],
+    targetName = "WidgetsExtension",
+    bundleIdentifier = `${config.ios?.bundleIdentifier}.Widgets`,
   }
 ) => {
-  if (!enabled) {
-    return config;
-  }
-
-  const targetName = "WidgetsExtension";
-  const bundleIdentifier = `${config.ios?.bundleIdentifier}.Widgets`;
+  const props: WidgetPluginProps = {
+    enabled,
+    deploymentTarget,
+    widgetsFolder,
+    groupIdentifier,
+    pods,
+    targetName,
+    bundleIdentifier,
+  };
 
   return withPlugins(config, [
-    [
-      withXcode,
-      {
-        targetName,
-        bundleIdentifier,
-        deploymentTarget,
-        widgetsFolder,
-      },
-    ],
-    [withWidgetExtensionEntitlements, { targetName, groupIdentifier }],
-    [withPodfile, { targetName, pods }],
-    [withConfig, { targetName, bundleIdentifier, groupIdentifier }],
+    [withXcode, props],
+    [withWidgetExtensionEntitlements, props],
+    [withPodfile, props],
+    [withConfig, props],
   ]);
 };
 

package/plugin/src/lib/getWidgetFiles.ts

@@ -55,6 +55,13 @@ export function getWidgetFiles(widgetsPath: string, targetPath: string) {
     copyFileSync(source, targetPath);
   });
 
+  // Copy Module.swift and Attributes.swift
+  const modulePath = path.join(__dirname, "../../../ios");
+  copyFileSync(
+    path.join(widgetsPath, "Module.swift"),
+    path.join(modulePath, "Module.swift")
+  );
+
   // Copy directories
   widgetFiles.assetDirectories.forEach((directory) => {
     const imagesXcassetsSource = path.join(widgetsPath, directory);

package/plugin/src/types.ts

@@ -0,0 +1,9 @@
+export interface WidgetPluginProps {
+  enabled?: boolean;
+  widgetsFolder?: string;
+  deploymentTarget?: string;
+  groupIdentifier: string;
+  pods?: string[];
+  targetName?: string;
+  bundleIdentifier?: string;
+}

package/plugin/src/withConfig.ts

@@ -3,12 +3,16 @@ import {
   addApplicationGroupsEntitlement,
   getWidgetExtensionEntitlements,
 } from "./lib/getWidgetExtensionEntitlements";
+import { WidgetPluginProps } from "./types";
+
+export const withConfig: ConfigPlugin<Required<WidgetPluginProps>> = (
+  config,
+  { enabled, groupIdentifier, targetName, bundleIdentifier }
+) => {
+  if (!enabled) {
+    return config;
+  }
 
-export const withConfig: ConfigPlugin<{
-  bundleIdentifier: string;
-  targetName: string;
-  groupIdentifier?: string;
-}> = (config, { bundleIdentifier, targetName, groupIdentifier }) => {
   let configIndex: null | number = null;
   config.extra?.eas?.build?.experimental?.ios?.appExtensions?.forEach(
     (ext: any, index: number) => {

package/plugin/src/withPodfile.ts

@@ -2,11 +2,16 @@ import { mergeContents } from "@expo/config-plugins/build/utils/generateCode";
 import { ConfigPlugin, withDangerousMod } from "expo/config-plugins";
 import * as fs from "fs";
 import * as path from "path";
+import { WidgetPluginProps } from "./types";
+
+export const withPodfile: ConfigPlugin<Required<WidgetPluginProps>> = (
+  config,
+  { enabled, targetName, pods }
+) => {
+  if (!enabled) {
+    return config;
+  }
 
-export const withPodfile: ConfigPlugin<{
-  targetName: string;
-  pods?: string[];
-}> = (config, { targetName, pods = [] }) => {
   return withDangerousMod(config, [
     "ios",
     (config) => {

package/plugin/src/withWidgetExtensionEntitlements.ts

@@ -4,13 +4,15 @@ import * as fs from "fs";
 import * as path from "path";
 
 import { getWidgetExtensionEntitlements } from "./lib/getWidgetExtensionEntitlements";
+import { WidgetPluginProps } from "./types";
+
+export const withWidgetExtensionEntitlements: ConfigPlugin<
+  Required<WidgetPluginProps>
+> = (config, { enabled, targetName, groupIdentifier }) => {
+  if (!enabled) {
+    return config;
+  }
 
-export const withWidgetExtensionEntitlements: ConfigPlugin<{
-  targetName: string;
-  targetPath: string;
-  groupIdentifier: string;
-  appleSignin: boolean;
-}> = (config, { targetName, groupIdentifier }) => {
   return withInfoPlist(config, (config) => {
     const targetPath = path.join(
       config.modRequest.platformProjectRoot,

package/plugin/src/withXcode.ts

@@ -9,29 +9,25 @@ import { addTargetDependency } from "./xcode/addTargetDependency";
 import { addPbxGroup } from "./xcode/addPbxGroup";
 import { addBuildPhases } from "./xcode/addBuildPhases";
 import { getWidgetFiles } from "./lib/getWidgetFiles";
+import { WidgetPluginProps } from "./types";
 
-export const withXcode: ConfigPlugin<{
-  targetName: string;
-  bundleIdentifier: string;
-  deploymentTarget: string;
-  widgetsFolder: string;
-}> = (
+export const withXcode: ConfigPlugin<Required<WidgetPluginProps>> = (
   config,
-  { targetName, bundleIdentifier, deploymentTarget, widgetsFolder }
+  { enabled, targetName, bundleIdentifier, deploymentTarget, widgetsFolder }
 ) => {
   return withXcodeProject(config, (config) => {
-    const xcodeProject = config.modResults;
-    const widgetsPath = path.join(config.modRequest.projectRoot, widgetsFolder);
-
-    const targetUuid = xcodeProject.generateUuid();
-    const groupName = "Embed Foundation Extensions";
-    const { platformProjectRoot } = config.modRequest;
-    const marketingVersion = config.version;
+    const { platformProjectRoot, projectRoot } = config.modRequest;
 
+    const widgetsPath = path.join(projectRoot, widgetsFolder);
     const targetPath = path.join(platformProjectRoot, targetName);
-
     const widgetFiles = getWidgetFiles(widgetsPath, targetPath);
 
+    if (!enabled) {
+      return config;
+    }
+
+    const xcodeProject = config.modResults;
+    const marketingVersion = config.version;
     const xCConfigurationList = addXCConfigurationList(xcodeProject, {
       targetName,
       currentProjectVersion: config.ios!.buildNumber || "1",
@@ -40,11 +36,13 @@ export const withXcode: ConfigPlugin<{
       marketingVersion,
     });
 
+    const groupName = "Embed Foundation Extensions";
     const productFile = addProductFile(xcodeProject, {
       targetName,
       groupName,
     });
 
+    const targetUuid = xcodeProject.generateUuid();
     const target = addToPbxNativeTargetSection(xcodeProject, {
       targetName,
       targetUuid,