codeplay-common 1.0.44 → 1.0.46

package/package.json

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

package/scripts/uninstall.js

@@ -4,12 +4,7 @@ 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...");
-
-// Check if commonBuildPath exists
-if (!fs.existsSync(commonBuildPath)) {
-    console.warn("⚠️ Common build path does not exist, skipping removal.");
-}
+console.log("🚀 Uninstalling: Removing old and copied files...");
 
 // Helper function to extract version from filename
 const extractVersion = (filename) => {
@@ -17,19 +12,17 @@ const extractVersion = (filename) => {
     return match ? parseFloat(match[1]) : null;
 };
 
-// Helper function to get base name of versioned files
-const getBaseName = (filename) => {
-    return filename.replace(/-\d+\.\d+\.js$/, "");
-};
+// Helper function to get base name without version
+const getBaseName = (filename) => filename.replace(/-\d+\.\d+\.js$/, "");
 
-// Find versioned files in the project directory
-const versionedFiles = fs.readdirSync(projectRoot)
+// Step 1: Find all versioned files in the project directory
+const filesInProject = fs.readdirSync(projectRoot)
     .filter(file => file.match(/(add-splash-screen|setSplashAnimation|codeplayBeforeBuild)-\d+\.\d+\.js/));
 
 const latestVersions = {};
 
-// Group files by their base name and track latest versions
-versionedFiles.forEach(file => {
+// Step 2: Determine the latest version for each file type
+filesInProject.forEach(file => {
     const baseName = getBaseName(file);
     const version = extractVersion(file);
 
@@ -40,28 +33,35 @@ versionedFiles.forEach(file => {
     }
 });
 
-// Remove older versions
-versionedFiles.forEach(file => {
+// Step 3: Remove ALL outdated versions, even if latest is missing
+filesInProject.forEach(file => {
     const baseName = getBaseName(file);
-    if (latestVersions[baseName] && file !== latestVersions[baseName].file) {
-        const filePath = path.join(projectRoot, file);
-        fs.unlinkSync(filePath);
-        console.log(`🗑️ Removed old version: ${filePath}`);
-    }
-});
-
-// Remove files listed in commonBuildPath
-fs.readdirSync(commonBuildPath).forEach(file => {
-    const destPath = path.join(projectRoot, file);
+    const version = extractVersion(file);
+    const filePath = path.join(projectRoot, file);
 
-    if (fs.existsSync(destPath)) {
+    if (version !== null && latestVersions[baseName] && version < latestVersions[baseName].version) {
         try {
-            fs.unlinkSync(destPath);
-            console.log(`🗑️ Removed file: ${destPath}`);
+            fs.unlinkSync(filePath);
+            console.log(`🗑️ Removed outdated file: ${filePath}`);
         } catch (error) {
-            console.warn(`⚠️ Failed to remove ${destPath}: ${error.message}`);
+            console.warn(`⚠️ Failed to remove ${filePath}: ${error.message}`);
         }
     }
 });
 
+// Step 4: Remove files listed in commonBuildPath
+if (fs.existsSync(commonBuildPath)) {
+    fs.readdirSync(commonBuildPath).forEach(file => {
+        const destPath = path.join(projectRoot, file);
+        if (fs.existsSync(destPath)) {
+            try {
+                fs.unlinkSync(destPath);
+                console.log(`🗑️ Removed file: ${destPath}`);
+            } catch (error) {
+                console.warn(`⚠️ Failed to remove ${destPath}: ${error.message}`);
+            }
+        }
+    });
+}
+
 console.log("✅ Uninstall cleanup complete!");