Copy progress unused + remove works with files and remove given folder (used to only empty it)

Author: devAxeon

app-test/package-lock.json

@@ -13,7 +13,10 @@
   "author": "Apache Cordova Team",
   "license": "Apache-2.0",
   "dependencies": {
-    "cordova-android": "^8.1.0"
+    "cordova": "^9.0.0",
+    "cordova-android": "^8.1.0",
+    "cordova-plugin-file": "^6.0.2",
+    "cordova-plugin-whitelist": "1"
   },
   "devDependencies": {
     "cordova-plugin-whitelist": "^1.3.4"

app-test/package.json

@@ -28,7 +28,7 @@ declare module shell {
    * @param source
    * @param dest
    */
-  const copy: (source: string, dest: string, progressCallback?: (percent: any) => void) => Promise<ShellEntry>;
+  const copy: (source: string, dest: string) => Promise<ShellEntry>;
   /**
    * Download a remote file to a local folder
    * @param url

dist/cordova-shell.js

@@ -2,7 +2,7 @@ import {ShellEntry} from "../ShellEntry";
 const fs = require('fs-extra')
 import {ls} from "./ls";
 
-export function copy(source : string, dest : string, progressCallback? : (percent) => void) : Promise<ShellEntry> {
+export function copy(source : string, dest : string) : Promise<ShellEntry> {
   return new Promise((resolve, reject) => {
     fs.copy(source, dest, err => {
       if(err) {
@@ -15,4 +15,4 @@ export function copy(source : string, dest : string, progressCallback? : (percen
       }
     })
   });
-}
+}

dist/cordova-shell.js.map

@@ -1,16 +1,39 @@
-const fs = require('fs-extra')
+const fs = require('fs-extra');
 import * as log from './log';
 
 export const remove = (path : string) : Promise<void> => {
   return new Promise((resolve, reject) => {
-    fs.emptyDir(path, err => {
-      if(err) {
+    fs.lstat(path, (err, stat) => {
+      if(err){
         reject(err);
-      }
-      else {
-        log.info('removed ' + path);
-        resolve();
+      } else {
+        if(stat.isFile()){
+          fs.remove(path, err => {
+            if(err) {
+              reject(err);
+            } else {
+              log.info('removed ' + path);
+              resolve();
+            }
+          });
+        } else {
+          fs.emptyDir(path, err => {
+            if(err) {
+              reject(err);
+            }
+            else {
+              fs.rmdir(path, (err) => {
+                if(err) {
+                  reject(err);
+                } else {
+                  log.info('removed ' + path);
+                  resolve();
+                }
+              });
+            }
+          });
+        }
       }
     });
   });
-};
+};