codeplay-common 1.0.45 → 1.0.46

package/package.json

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

package/scripts/uninstall.js

@@ -6,68 +6,62 @@ const commonBuildPath = path.join(__dirname, "../files"); // Path where files we
 
 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.");
-}
-
-// Helper function to extract version from file name
+// Helper function to extract version from filename
 const extractVersion = (filename) => {
     const match = filename.match(/-(\d+\.\d+)\.js$/);
     return match ? parseFloat(match[1]) : null;
 };
 
-// Helper function to get base name (without version and extension)
-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$/, "");
+
+// 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/));
 
-// 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 = getBaseName(file);
-        const version = extractVersion(file);
+// Step 2: Determine the latest version for each file type
+filesInProject.forEach(file => {
+    const baseName = getBaseName(file);
+    const version = extractVersion(file);
 
-        if (version !== null) {
-            // Store the latest version found
-            if (!latestVersions[baseName] || version > latestVersions[baseName].version) {
-                latestVersions[baseName] = { file, version };
-            }
+    if (version !== null) {
+        if (!latestVersions[baseName] || version > latestVersions[baseName].version) {
+            latestVersions[baseName] = { file, version };
         }
     }
 });
 
-// Remove all outdated versions
-fs.readdirSync(projectRoot).forEach(file => {
+// Step 3: Remove ALL outdated versions, even if latest is missing
+filesInProject.forEach(file => {
     const baseName = getBaseName(file);
     const version = extractVersion(file);
+    const filePath = path.join(projectRoot, file);
 
-    if (version !== null && latestVersions[baseName] && file !== latestVersions[baseName].file) {
-        const filePath = path.join(projectRoot, file);
+    if (version !== null && latestVersions[baseName] && version < latestVersions[baseName].version) {
         try {
             fs.unlinkSync(filePath);
-            console.log(`🗑️ Removed old version: ${filePath}`);
+            console.log(`🗑️ Removed outdated file: ${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 {
-            fs.unlinkSync(destPath);
-            console.log(`🗑️ Removed file: ${destPath}`);
-        } catch (error) {
-            console.warn(`⚠️ Failed to remove ${destPath}: ${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!");