codeplay-common 1.0.43 → 1.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeplay-common",
-  "version": "1.0.43",
+  "version": "1.0.45",
   "description": "Common build scripts and files",
   "scripts": {
 

package/scripts/uninstall.js

@@ -4,12 +4,11 @@ const path = require("path");
 const projectRoot = path.resolve(__dirname, "../../../"); // Project root
 const commonBuildPath = path.join(__dirname, "../files"); // Path where files were copied from
 
-console.log("🚀 Uninstalling: Removing copied files...");
+console.log("🚀 Uninstalling: Removing old and copied files...");
 
 // Check if commonBuildPath exists
 if (!fs.existsSync(commonBuildPath)) {
     console.warn("⚠️ Common build path does not exist, skipping removal.");
-    process.exit(0);
 }
 
 // Helper function to extract version from file name
@@ -18,58 +17,57 @@ const extractVersion = (filename) => {
     return match ? parseFloat(match[1]) : null;
 };
 
-// Collect files that match versioned patterns
-const versionedFilesMap = {};
+// Helper function to get base name (without version and extension)
+const getBaseName = (filename) => {
+    return filename.replace(/-\d+\.\d+\.js$/, "");
+};
+
+// Store latest versions for each file category
+const latestVersions = {};
 
 // Scan project directory for versioned files
 fs.readdirSync(projectRoot).forEach(file => {
     if (file.match(/(add-splash-screen|setSplashAnimation|codeplayBeforeBuild)-\d+\.\d+\.js/)) {
-        const baseName = file.split('-')[0];
+        const baseName = getBaseName(file);
         const version = extractVersion(file);
 
         if (version !== null) {
-            if (!versionedFilesMap[baseName] || version > versionedFilesMap[baseName].version) {
-                versionedFilesMap[baseName] = { file, version };
+            // Store the latest version found
+            if (!latestVersions[baseName] || version > latestVersions[baseName].version) {
+                latestVersions[baseName] = { file, version };
             }
         }
     }
 });
 
-// Read the common build folder and remove copied files
+// Remove all outdated versions
+fs.readdirSync(projectRoot).forEach(file => {
+    const baseName = getBaseName(file);
+    const version = extractVersion(file);
+
+    if (version !== null && latestVersions[baseName] && file !== latestVersions[baseName].file) {
+        const filePath = path.join(projectRoot, file);
+        try {
+            fs.unlinkSync(filePath);
+            console.log(`🗑️ Removed old version: ${filePath}`);
+        } catch (error) {
+            console.warn(`⚠️ Failed to remove ${filePath}: ${error.message}`);
+        }
+    }
+});
+
+// Remove files listed in commonBuildPath
 fs.readdirSync(commonBuildPath).forEach(file => {
     const destPath = path.join(projectRoot, file);
 
     if (fs.existsSync(destPath)) {
         try {
-            const stats = fs.statSync(destPath);
-            
-            if (stats.isDirectory()) {
-                fs.rmSync(destPath, { recursive: true, force: true });
-                console.log(`🗑️ Removed folder: ${destPath}`);
-            } else {
-                fs.unlinkSync(destPath);
-                console.log(`🗑️ Removed file: ${destPath}`);
-            }
+            fs.unlinkSync(destPath);
+            console.log(`🗑️ Removed file: ${destPath}`);
         } catch (error) {
             console.warn(`⚠️ Failed to remove ${destPath}: ${error.message}`);
         }
-    } else {
-        console.log(`✅ Already removed: ${destPath}`);
     }
 });
 
-// Remove older versions of versioned files
-Object.keys(versionedFilesMap).forEach(baseName => {
-    fs.readdirSync(projectRoot).forEach(file => {
-        if (file.startsWith(baseName) && file.match(/-\d+\.\d+\.js$/)) {
-            const version = extractVersion(file);
-            if (version !== null && version < versionedFilesMap[baseName].version) {
-                const filePath = path.join(projectRoot, file);
-                fs.unlinkSync(filePath);
-                console.log(`🗑️ Removed old version: ${filePath}`);
-            }
-        }
-    });
-});
-
 console.log("✅ Uninstall cleanup complete!");