react-native-ios-widget 0.0.6 → 0.0.7

package/package.json

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

@@ -6,24 +6,22 @@ const withWidgetExtensionEntitlements_1 = require("./withWidgetExtensionEntitlem
 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`;
     return (0, config_plugins_1.withPlugins)(config, [
         [
             withXcode_1.withXcode,
             {
+                enabled,
                 targetName,
                 bundleIdentifier,
                 deploymentTarget,
                 widgetsFolder,
             },
         ],
-        [withWidgetExtensionEntitlements_1.withWidgetExtensionEntitlements, { targetName, groupIdentifier }],
-        [withPodfile_1.withPodfile, { targetName, pods }],
-        [withConfig_1.withConfig, { targetName, bundleIdentifier, groupIdentifier }],
+        [withWidgetExtensionEntitlements_1.withWidgetExtensionEntitlements, { enabled, targetName, groupIdentifier }],
+        [withPodfile_1.withPodfile, { enabled, targetName, pods }],
+        [withConfig_1.withConfig, { enabled, targetName, bundleIdentifier, groupIdentifier }],
     ]);
 };
 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/withConfig.d.ts

@@ -1,5 +1,6 @@
 import { ConfigPlugin } from "expo/config-plugins";
 export declare const withConfig: ConfigPlugin<{
+    enabled: boolean;
     bundleIdentifier: string;
     targetName: string;
     groupIdentifier?: string;

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, bundleIdentifier, targetName, groupIdentifier }) => {
+    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,6 @@
 import { ConfigPlugin } from "expo/config-plugins";
 export declare const withPodfile: ConfigPlugin<{
+    enabled: boolean;
     targetName: string;
     pods?: string[];
 }>;

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,5 +1,6 @@
 import { ConfigPlugin } from "expo/config-plugins";
 export declare const withWidgetExtensionEntitlements: ConfigPlugin<{
+    enabled: boolean;
     targetName: string;
     targetPath: string;
     groupIdentifier: string;

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,5 +1,6 @@
 import { ConfigPlugin } from "expo/config-plugins";
 export declare const withXcode: ConfigPlugin<{
+    enabled: boolean;
     targetName: string;
     bundleIdentifier: string;
     deploymentTarget: string;

package/plugin/build/withXcode.js

@@ -34,7 +34,16 @@ 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 }) => {
+    if (!enabled) {
+        return (0, config_plugins_1.withXcodeProject)(config, (config) => {
+            const widgetsPath = path.join(config.modRequest.projectRoot, widgetsFolder);
+            const { platformProjectRoot } = config.modRequest;
+            const targetPath = path.join(platformProjectRoot, targetName);
+            (0, getWidgetFiles_1.getWidgetFiles)(widgetsPath, targetPath);
+            return config;
+        });
+    }
     return (0, config_plugins_1.withXcodeProject)(config, (config) => {
         const xcodeProject = config.modResults;
         const widgetsPath = path.join(config.modRequest.projectRoot, widgetsFolder);

package/plugin/src/index.ts

@@ -21,10 +21,6 @@ const withWidget: ConfigPlugin<{
     pods,
   }
 ) => {
-  if (!enabled) {
-    return config;
-  }
-
   const targetName = "WidgetsExtension";
   const bundleIdentifier = `${config.ios?.bundleIdentifier}.Widgets`;
 
@@ -32,15 +28,16 @@ const withWidget: ConfigPlugin<{
     [
       withXcode,
       {
+        enabled,
         targetName,
         bundleIdentifier,
         deploymentTarget,
         widgetsFolder,
       },
     ],
-    [withWidgetExtensionEntitlements, { targetName, groupIdentifier }],
-    [withPodfile, { targetName, pods }],
-    [withConfig, { targetName, bundleIdentifier, groupIdentifier }],
+    [withWidgetExtensionEntitlements, { enabled, targetName, groupIdentifier }],
+    [withPodfile, { enabled, targetName, pods }],
+    [withConfig, { enabled, targetName, bundleIdentifier, groupIdentifier }],
   ]);
 };
 

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/withConfig.ts

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

package/plugin/src/withPodfile.ts

@@ -4,9 +4,14 @@ import * as fs from "fs";
 import * as path from "path";
 
 export const withPodfile: ConfigPlugin<{
+  enabled: boolean;
   targetName: string;
   pods?: string[];
-}> = (config, { targetName, pods = [] }) => {
+}> = (config, { enabled, targetName, pods = [] }) => {
+  if (!enabled) {
+    return config;
+  }
+
   return withDangerousMod(config, [
     "ios",
     (config) => {

package/plugin/src/withWidgetExtensionEntitlements.ts

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

package/plugin/src/withXcode.ts

@@ -11,14 +11,28 @@ import { addBuildPhases } from "./xcode/addBuildPhases";
 import { getWidgetFiles } from "./lib/getWidgetFiles";
 
 export const withXcode: ConfigPlugin<{
+  enabled: boolean;
   targetName: string;
   bundleIdentifier: string;
   deploymentTarget: string;
   widgetsFolder: string;
 }> = (
   config,
-  { targetName, bundleIdentifier, deploymentTarget, widgetsFolder }
+  { enabled, targetName, bundleIdentifier, deploymentTarget, widgetsFolder }
 ) => {
+  if (!enabled) {
+    return withXcodeProject(config, (config) => {
+      const widgetsPath = path.join(
+        config.modRequest.projectRoot,
+        widgetsFolder
+      );
+      const { platformProjectRoot } = config.modRequest;
+      const targetPath = path.join(platformProjectRoot, targetName);
+      getWidgetFiles(widgetsPath, targetPath);
+      return config;
+    });
+  }
+
   return withXcodeProject(config, (config) => {
     const xcodeProject = config.modResults;
     const widgetsPath = path.join(config.modRequest.projectRoot, widgetsFolder);