expo-live-activity 0.2.0-alpha → 0.2.0-alpha1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-live-activity",
-  "version": "0.2.0-alpha",
+  "version": "0.2.0-alpha1",
   "description": "A module for adding Live Activity to a React Native app for iOS.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -21,7 +21,9 @@
     "ios",
     "apple"
   ],
-  "repository": "https://github.com/software-mansion-labs/expo-live-activity",
+  "author": "Kamil Owczarz <kamil.owczarz@swmansion.com> (https://github.com/kowczarz)",
+  "contributors": ["Anna Olak <anna.olak@swmansion.com> (https://github.com/anna1901)"],
+  "repository": "https://github.com/software-mansion-labs/expo-live-activity.git",
   "bugs": {
     "url": "https://github.com/software-mansion-labs/expo-live-activity/issues"
   },

package/plugin/build/index.js

@@ -7,9 +7,7 @@ const withXcode_1 = require("./withXcode");
 const withWidgetExtensionEntitlements_1 = require("./withWidgetExtensionEntitlements");
 const withWidgetsAndLiveActivities = (config) => {
     const deploymentTarget = "16.2";
-    const moduleFileName = "ExpoNativeConfigurationModule.swift";
-    const attributesFileName = "LiveActivityAttributes.swift";
-    const targetName = `${config_plugins_1.IOSConfig.XcodeUtils.sanitizedName(config.name)}LiveActivity`; // Widgets => LiveActivity
+    const targetName = `${config_plugins_1.IOSConfig.XcodeUtils.sanitizedName(config.name)}LiveActivity`;
     const bundleIdentifier = `${config.ios?.bundleIdentifier}.${targetName}`;
     config.ios = {
         ...config.ios,
@@ -26,9 +24,6 @@ const withWidgetsAndLiveActivities = (config) => {
                 targetName,
                 bundleIdentifier,
                 deploymentTarget,
-                // widgetsFolder,
-                moduleFileName,
-                attributesFileName,
             },
         ],
         [withWidgetExtensionEntitlements_1.withWidgetExtensionEntitlements, { targetName }],

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

@@ -6,5 +6,5 @@ export type WidgetFiles = {
     intentFiles: string[];
     otherFiles: string[];
 };
-export declare function getWidgetFiles(targetPath: string, moduleFileName: string, attributesFileName: string): WidgetFiles;
+export declare function getWidgetFiles(targetPath: string): WidgetFiles;
 export declare function copyFileSync(source: string, target: string): void;

package/plugin/build/lib/getWidgetFiles.js

@@ -37,9 +37,7 @@ exports.getWidgetFiles = getWidgetFiles;
 exports.copyFileSync = copyFileSync;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-function getWidgetFiles(
-// widgetsPath: string, // to zmieniamy, bo u nas to będzie "config.modRequest.projectRoot/[tu może coś jeszcze być]/node_modules/nasz-moduł/iosViews"
-targetPath, moduleFileName, attributesFileName) {
+function getWidgetFiles(targetPath) {
     let packagePath;
     try {
         packagePath = path.dirname(require.resolve("expo-live-activity/package.json"));
@@ -47,8 +45,7 @@ targetPath, moduleFileName, attributesFileName) {
     catch {
         console.log("Building for example app");
     }
-    const widgetsPath = path.join(packagePath ? packagePath : "..", "/ios-files");
-    console.log(`Widgets path: ${widgetsPath}`);
+    const liveActivityFilesPath = path.join(packagePath ? packagePath : "..", "/ios-files");
     const imageAssetsPath = "./assets/live_activity";
     const widgetFiles = {
         swiftFiles: [],
@@ -58,20 +55,15 @@ targetPath, moduleFileName, attributesFileName) {
         intentFiles: [],
         otherFiles: [],
     };
-    console.log(`Getting widget files`);
     if (!fs.existsSync(targetPath)) {
-        console.log(`Making directory at: ${targetPath}`);
         fs.mkdirSync(targetPath, { recursive: true });
     }
-    if (fs.lstatSync(widgetsPath).isDirectory()) {
-        const files = fs.readdirSync(widgetsPath);
-        console.log(`Files: ${files}`);
+    if (fs.lstatSync(liveActivityFilesPath).isDirectory()) {
+        const files = fs.readdirSync(liveActivityFilesPath);
         files.forEach((file) => {
             const fileExtension = file.split(".").pop();
             if (fileExtension === "swift") {
-                if (file !== moduleFileName) {
-                    widgetFiles.swiftFiles.push(file);
-                }
+                widgetFiles.swiftFiles.push(file);
             }
             else if (fileExtension === "entitlements") {
                 widgetFiles.entitlementFiles.push(file);
@@ -98,25 +90,20 @@ targetPath, moduleFileName, attributesFileName) {
         ...widgetFiles.intentFiles,
         ...widgetFiles.otherFiles,
     ].forEach((file) => {
-        const source = path.join(widgetsPath, file);
+        const source = path.join(liveActivityFilesPath, file);
         copyFileSync(source, targetPath);
     });
     // Copy assets directory
-    const imagesXcassetsSource = path.join(widgetsPath, "Assets.xcassets");
+    const imagesXcassetsSource = path.join(liveActivityFilesPath, "Assets.xcassets");
     copyFolderRecursiveSync(imagesXcassetsSource, targetPath);
     // Move images to assets directory
-    console.log(`Images Path: ${imageAssetsPath}`);
     if (fs.lstatSync(imageAssetsPath).isDirectory()) {
         const imagesXcassetsTarget = path.join(targetPath, "Assets.xcassets");
-        console.log(`Assets Target: ${imagesXcassetsTarget}`);
         const files = fs.readdirSync(imageAssetsPath);
-        console.log(`Images: ${files}`);
         files.forEach((file) => {
             if (path.extname(file).match(/\.(png|jpg|jpeg)$/)) {
                 const source = path.join(imageAssetsPath, file);
-                console.log(`Source: ${source}`);
                 const imageSetDir = path.join(imagesXcassetsTarget, `${path.basename(file, path.extname(file))}.imageset`);
-                console.log(`imageSetDir: ${source}`);
                 // Create the .imageset directory if it doesn't exist
                 if (!fs.existsSync(imageSetDir)) {
                     fs.mkdirSync(imageSetDir, { recursive: true });
@@ -137,9 +124,7 @@ targetPath, moduleFileName, attributesFileName) {
                         version: 1
                     }
                 };
-                fs.writeFileSync(path.join(imageSetDir, 'Contents.json'), JSON.stringify(contentsJson, null, 2) // beautify the JSON output
-                );
-                console.log(`Processed ${file} into ${imageSetDir}`);
+                fs.writeFileSync(path.join(imageSetDir, 'Contents.json'), JSON.stringify(contentsJson, null, 2));
             }
         });
     }

package/plugin/build/withWidgetExtensionEntitlements.js

@@ -50,7 +50,6 @@ const withWidgetExtensionEntitlements = (config, { targetName }) => {
         // });
         fs.mkdirSync(path.dirname(filePath), { recursive: true });
         fs.writeFileSync(filePath, plist_1.default.build({}));
-        console.log("Finishing running withWidgetExtensionEntitlements");
         return config;
     });
 };

package/plugin/build/withXcode.d.ts

@@ -3,6 +3,4 @@ export declare const withXcode: ConfigPlugin<{
     targetName: string;
     bundleIdentifier: string;
     deploymentTarget: string;
-    moduleFileName: string;
-    attributesFileName: string;
 }>;

package/plugin/build/withXcode.js

@@ -44,22 +44,15 @@ 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,
-moduleFileName, attributesFileName, }) => {
+const withXcode = (config, { targetName, bundleIdentifier, deploymentTarget, }) => {
     return (0, config_plugins_1.withXcodeProject)(config, (config) => {
-        console.log("Running withXcode");
         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 targetPath = path.join(platformProjectRoot, targetName);
-        const widgetFiles = (0, getWidgetFiles_1.getWidgetFiles)(
-        // widgetsPath,
-        targetPath, moduleFileName, attributesFileName);
-        console.log("Finished running withFiles");
+        const widgetFiles = (0, getWidgetFiles_1.getWidgetFiles)(targetPath);
         const xCConfigurationList = (0, addXCConfigurationList_1.addXCConfigurationList)(xcodeProject, {
             targetName,
             currentProjectVersion: config.ios.buildNumber || "1",
@@ -67,19 +60,16 @@ moduleFileName, attributesFileName, }) => {
             deploymentTarget,
             marketingVersion,
         });
-        console.log("Finished running addXCConfigurationList");
         const productFile = (0, addProductFile_1.addProductFile)(xcodeProject, {
             targetName,
             groupName,
         });
-        console.log("Finished running addProductFile");
         const target = (0, addToPbxNativeTargetSection_1.addToPbxNativeTargetSection)(xcodeProject, {
             targetName,
             targetUuid,
             productFile,
             xCConfigurationList,
         });
-        console.log("Finished running addToPbxNativeTargetSection");
         (0, addToPbxProjectSection_1.addToPbxProjectSection)(xcodeProject, target);
         (0, addTargetDependency_1.addTargetDependency)(xcodeProject, target);
         (0, addBuildPhases_1.addBuildPhases)(xcodeProject, {
@@ -92,7 +82,6 @@ moduleFileName, attributesFileName, }) => {
             targetName,
             widgetFiles,
         });
-        console.log("Finished running withXcode");
         return config;
     });
 };

package/plugin/src/index.ts

@@ -9,12 +9,9 @@ const withWidgetsAndLiveActivities: ConfigPlugin = (
   config
 ) => {
   const deploymentTarget = "16.2";
-  const moduleFileName = "ExpoNativeConfigurationModule.swift"
-  const attributesFileName = "LiveActivityAttributes.swift"
-
   const targetName = `${IOSConfig.XcodeUtils.sanitizedName(
     config.name
-  )}LiveActivity`; // Widgets => LiveActivity
+  )}LiveActivity`;
   const bundleIdentifier = `${config.ios?.bundleIdentifier}.${targetName}`;
 
   config.ios = {
@@ -33,9 +30,6 @@ const withWidgetsAndLiveActivities: ConfigPlugin = (
         targetName,
         bundleIdentifier,
         deploymentTarget,
-        // widgetsFolder,
-        moduleFileName,
-        attributesFileName,
       },
     ],
     [withWidgetExtensionEntitlements, { targetName }],

package/plugin/src/lib/getWidgetFiles.ts

@@ -11,10 +11,7 @@ export type WidgetFiles = {
 };
 
 export function getWidgetFiles(
-  // widgetsPath: string, // to zmieniamy, bo u nas to będzie "config.modRequest.projectRoot/[tu może coś jeszcze być]/node_modules/nasz-moduł/iosViews"
   targetPath: string,
-  moduleFileName: string,
-  attributesFileName: string
 ) {
   let packagePath
   try {
@@ -22,9 +19,9 @@ export function getWidgetFiles(
   } catch {
     console.log("Building for example app")
   }
-  const widgetsPath = path.join(packagePath ? packagePath : "..", "/ios-files");
-  console.log(`Widgets path: ${widgetsPath}`);
+  const liveActivityFilesPath = path.join(packagePath ? packagePath : "..", "/ios-files");
   const imageAssetsPath = "./assets/live_activity";
+
   const widgetFiles: WidgetFiles = {
     swiftFiles: [],
     entitlementFiles: [],
@@ -33,23 +30,19 @@ export function getWidgetFiles(
     intentFiles: [],
     otherFiles: [],
   };
-  console.log(`Getting widget files`)
+
   if (!fs.existsSync(targetPath)) {
-    console.log(`Making directory at: ${targetPath}`)
     fs.mkdirSync(targetPath, { recursive: true });
   }
 
-  if (fs.lstatSync(widgetsPath).isDirectory()) {
-    const files = fs.readdirSync(widgetsPath);
-    console.log(`Files: ${files}`)
+  if (fs.lstatSync(liveActivityFilesPath).isDirectory()) {
+    const files = fs.readdirSync(liveActivityFilesPath);
 
     files.forEach((file) => {
       const fileExtension = file.split(".").pop();
 
       if (fileExtension === "swift") {
-        if (file !== moduleFileName) {
-          widgetFiles.swiftFiles.push(file);
-        }
+        widgetFiles.swiftFiles.push(file);
       } else if (fileExtension === "entitlements") {
         widgetFiles.entitlementFiles.push(file);
       } else if (fileExtension === "plist") {
@@ -73,29 +66,25 @@ export function getWidgetFiles(
     ...widgetFiles.intentFiles,
     ...widgetFiles.otherFiles,
   ].forEach((file) => {
-    const source = path.join(widgetsPath, file);
+    const source = path.join(liveActivityFilesPath, file);
     copyFileSync(source, targetPath);
   });
 
   // Copy assets directory
-  const imagesXcassetsSource = path.join(widgetsPath, "Assets.xcassets");
+  const imagesXcassetsSource = path.join(liveActivityFilesPath, "Assets.xcassets");
   copyFolderRecursiveSync(imagesXcassetsSource, targetPath);
 
   // Move images to assets directory
-  console.log(`Images Path: ${imageAssetsPath}`)
   if (fs.lstatSync(imageAssetsPath).isDirectory()) {
     const imagesXcassetsTarget = path.join(targetPath, "Assets.xcassets");
-    console.log(`Assets Target: ${imagesXcassetsTarget}`)
 
     const files = fs.readdirSync(imageAssetsPath);
-    console.log(`Images: ${files}`)
+
     files.forEach((file) => {
       if (path.extname(file).match(/\.(png|jpg|jpeg)$/)) {
         const source = path.join(imageAssetsPath, file);
-        console.log(`Source: ${source}`)
         const imageSetDir = path.join(imagesXcassetsTarget, `${path.basename(file, path.extname(file))}.imageset`);
 
-        console.log(`imageSetDir: ${source}`)
         // Create the .imageset directory if it doesn't exist
         if (!fs.existsSync(imageSetDir)) {
           fs.mkdirSync(imageSetDir, { recursive: true });
@@ -121,10 +110,8 @@ export function getWidgetFiles(
         
         fs.writeFileSync(
           path.join(imageSetDir, 'Contents.json'),
-          JSON.stringify(contentsJson, null, 2) // beautify the JSON output
+          JSON.stringify(contentsJson, null, 2)
         );
-
-        console.log(`Processed ${file} into ${imageSetDir}`);
       }
     })
   }

package/plugin/src/withWidgetExtensionEntitlements.ts

@@ -20,7 +20,6 @@ export const withWidgetExtensionEntitlements: ConfigPlugin<{
 
     fs.mkdirSync(path.dirname(filePath), { recursive: true });
     fs.writeFileSync(filePath, plist.build({}));
-    console.log("Finishing running withWidgetExtensionEntitlements")
     return config;
   });
 };

package/plugin/src/withXcode.ts

@@ -14,25 +14,16 @@ export const withXcode: ConfigPlugin<{
   targetName: string;
   bundleIdentifier: string;
   deploymentTarget: string;
-  // widgetsFolder: string;
-  moduleFileName: string;
-  attributesFileName: string;
 }> = (
   config,
   {
     targetName,
     bundleIdentifier,
     deploymentTarget,
-    // widgetsFolder,
-    moduleFileName,
-    attributesFileName,
   }
 ) => {
   return withXcodeProject(config, (config) => {
-    console.log("Running withXcode")
     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;
@@ -41,13 +32,9 @@ export const withXcode: ConfigPlugin<{
     const targetPath = path.join(platformProjectRoot, targetName);
 
     const widgetFiles = getWidgetFiles(
-      // widgetsPath,
       targetPath,
-      moduleFileName,
-      attributesFileName
     );
 
-    console.log("Finished running withFiles")
     const xCConfigurationList = addXCConfigurationList(xcodeProject, {
       targetName,
       currentProjectVersion: config.ios!.buildNumber || "1",
@@ -55,13 +42,11 @@ export const withXcode: ConfigPlugin<{
       deploymentTarget,
       marketingVersion,
     });
-    console.log("Finished running addXCConfigurationList")
 
     const productFile = addProductFile(xcodeProject, {
       targetName,
       groupName,
     });
-    console.log("Finished running addProductFile")
 
     const target = addToPbxNativeTargetSection(xcodeProject, {
       targetName,
@@ -69,7 +54,6 @@ export const withXcode: ConfigPlugin<{
       productFile,
       xCConfigurationList,
     });
-    console.log("Finished running addToPbxNativeTargetSection")
 
     addToPbxProjectSection(xcodeProject, target);
 
@@ -87,7 +71,6 @@ export const withXcode: ConfigPlugin<{
       widgetFiles,
     });
 
-    console.log("Finished running withXcode")
     return config;
   });
 };