react-native-ios-widget 0.0.10 → 0.0.12-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ios-widget",
-  "version": "0.0.10",
+  "version": "0.0.12-beta.1",
   "description": "Expo config plugin to add widgets to a React Native app",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -45,4 +45,4 @@
   "engines": {
     "node": ">=18.16.0"
   }
-}
+}

package/plugin/build/lib/getWidgetFiles.d.ts

@@ -5,4 +5,4 @@ export type WidgetFiles = {
     fontFiles: string[];
     assetDirectories: string[];
 };
-export declare const getWidgetFiles: (widgetsPath: string, targetPath: string) => WidgetFiles;
+export declare const getWidgetFiles: (widgetsPath: string, targetPath: string, moduleRoot: string) => WidgetFiles;

package/plugin/build/lib/getWidgetFiles.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWidgetFiles = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const getWidgetFiles = (widgetsPath, targetPath) => {
+const getWidgetFiles = (widgetsPath, targetPath, moduleRoot) => {
     const widgetFiles = {
         swiftFiles: [],
         entitlementFiles: [],
@@ -37,6 +37,16 @@ const getWidgetFiles = (widgetsPath, targetPath) => {
     if (!fs.existsSync(targetPath)) {
         fs.mkdirSync(targetPath, { recursive: true });
     }
+    // Ensure moduleRoot directory exists
+    if (!fs.existsSync(moduleRoot)) {
+        fs.mkdirSync(moduleRoot, { recursive: true });
+    }
+    // Check if Module.swift exists before proceeding
+    const moduleSwiftPath = path.join(widgetsPath, "Module.swift");
+    if (!fs.existsSync(moduleSwiftPath)) {
+        throw new Error(`Module.swift not found at ${moduleSwiftPath}. ` +
+            `The widgets folder must contain a Module.swift file for the ReactNativeWidgetExtension module to build correctly.`);
+    }
     if (fs.lstatSync(widgetsPath).isDirectory()) {
         const files = fs.readdirSync(widgetsPath);
         files.forEach((file) => {
@@ -70,9 +80,8 @@ const 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 Module.swift to moduleRoot (package ios directory)
+    copyFileSync(moduleSwiftPath, path.join(moduleRoot, "Module.swift"));
     // Copy directories
     widgetFiles.assetDirectories.forEach((directory) => {
         const imagesXcassetsSource = path.join(widgetsPath, directory);
@@ -86,7 +95,7 @@ const copyFileSync = (source, target) => {
     if (fs.existsSync(target) && fs.lstatSync(target).isDirectory()) {
         targetFile = path.join(target, path.basename(source));
     }
-    fs.writeFileSync(targetFile, fs.readFileSync(source));
+    fs.copyFileSync(source, targetFile);
 };
 const copyDirectorySync = (source, target) => {
     const targetPath = path.join(target, path.basename(source));

package/plugin/build/withXcode.js

@@ -37,12 +37,13 @@ const getWidgetFiles_1 = require("./lib/getWidgetFiles");
 const withXcode = (config, { enabled, targetName, bundleIdentifier, deploymentTarget, widgetsFolder }) => {
     return (0, config_plugins_1.withXcodeProject)(config, (config) => {
         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 widgetsPath = path.join(projectRoot, widgetsFolder);
+        const targetPath = path.join(platformProjectRoot, targetName);
+        const moduleRoot = path.join(projectRoot, "node_modules", "react-native-ios-widget", "ios");
+        const widgetFiles = (0, getWidgetFiles_1.getWidgetFiles)(widgetsPath, targetPath, moduleRoot);
         const xcodeProject = config.modResults;
         const marketingVersion = config.version;
         const xCConfigurationList = (0, addXCConfigurationList_1.addXCConfigurationList)(xcodeProject, {

package/plugin/src/lib/getWidgetFiles.ts

@@ -9,7 +9,11 @@ export type WidgetFiles = {
   assetDirectories: string[];
 };
 
-export const getWidgetFiles = (widgetsPath: string, targetPath: string) => {
+export const getWidgetFiles = (
+  widgetsPath: string,
+  targetPath: string,
+  moduleRoot: string
+) => {
   const widgetFiles: WidgetFiles = {
     swiftFiles: [],
     entitlementFiles: [],
@@ -22,6 +26,20 @@ export const getWidgetFiles = (widgetsPath: string, targetPath: string) => {
     fs.mkdirSync(targetPath, { recursive: true });
   }
 
+  // Ensure moduleRoot directory exists
+  if (!fs.existsSync(moduleRoot)) {
+    fs.mkdirSync(moduleRoot, { recursive: true });
+  }
+
+  // Check if Module.swift exists before proceeding
+  const moduleSwiftPath = path.join(widgetsPath, "Module.swift");
+  if (!fs.existsSync(moduleSwiftPath)) {
+    throw new Error(
+      `Module.swift not found at ${moduleSwiftPath}. ` +
+        `The widgets folder must contain a Module.swift file for the ReactNativeWidgetExtension module to build correctly.`
+    );
+  }
+
   if (fs.lstatSync(widgetsPath).isDirectory()) {
     const files = fs.readdirSync(widgetsPath);
 
@@ -55,12 +73,8 @@ export const 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 Module.swift to moduleRoot (package ios directory)
+  copyFileSync(moduleSwiftPath, path.join(moduleRoot, "Module.swift"));
 
   // Copy directories
   widgetFiles.assetDirectories.forEach((directory) => {
@@ -78,7 +92,7 @@ const copyFileSync = (source: string, target: string) => {
     targetFile = path.join(target, path.basename(source));
   }
 
-  fs.writeFileSync(targetFile, fs.readFileSync(source));
+  fs.copyFileSync(source, targetFile);
 };
 
 const copyDirectorySync = (source: string, target: string) => {

package/plugin/src/withXcode.ts

@@ -18,14 +18,20 @@ export const withXcode: ConfigPlugin<Required<WidgetConfig>> = (
   return withXcodeProject(config, (config) => {
     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 widgetsPath = path.join(projectRoot, widgetsFolder);
+    const targetPath = path.join(platformProjectRoot, targetName);
+    const moduleRoot = path.join(
+      projectRoot,
+      "node_modules",
+      "react-native-ios-widget",
+      "ios"
+    );
+    const widgetFiles = getWidgetFiles(widgetsPath, targetPath, moduleRoot);
+
     const xcodeProject = config.modResults;
     const marketingVersion = config.version;
     const xCConfigurationList = addXCConfigurationList(xcodeProject, {