update maintenance scripts

Author: krausest

cleanup.js

@@ -3,38 +3,31 @@ var exec = require('child_process').execSync;
 var fs = require('fs');
 var commandExists = require('command-exists');
 const path = require('path');
-
-var installCommand = 'npm install';
-
-var excludedDirectories = ['css', 'dist','node_modules','webdriver-java'];
+const rimraf = require('rimraf');
 
 function rmIfExists(base, name) {
 	let dir = path.join(base, name);
 	if(fs.existsSync(dir)) {
-		let cleanCommand = 'rm -r '+name;
-		console.log("Executing "+cleanCommand+" in "+base);
-		exec(cleanCommand, {
-			cwd: base,
-			stdio: 'inherit'
-		});
+		console.log("Clean ",dir);
+        rimraf.sync(dir);
 	}
 }
 
-_.each(fs.readdirSync('.'), function(name) {
-	if(fs.statSync(name).isDirectory() && name[0] !== '.' && excludedDirectories.indexOf(name)==-1) {
-		if(fs.existsSync(name+"/node_modules")) {
-			let cleanCommand = 'rm -r node_modules';
-			console.log("Executing "+cleanCommand+" in "+name);
-			exec(cleanCommand, {
-				cwd: name,
-				stdio: 'inherit'
-			});
+for (let keyedType of ['keyed', 'non-keyed']) {
+    let dir = path.resolve('frameworks', keyedType);
+    let directories = fs.readdirSync(dir);
+
+    for (let name of directories) {
+        let fd = path.resolve(dir, name);
+        console.log('cleaning ', fd);
+		if(fs.existsSync(fd+"/node_modules")) {
+			rimraf.sync(fd+"/node_modules");
 		}
-		rmIfExists(name, "package-lock.json");
-		rmIfExists(name, "yarn.lock");
-		rmIfExists(name, "dist");
-		rmIfExists(name, "elm-stuff");
-		rmIfExists(name, "bower_components");
-		rmIfExists(name, "node_modules");
+		rmIfExists(fd, "package-lock.json");
+		rmIfExists(fd, "yarn.lock");
+		rmIfExists(fd, "dist");
+		rmIfExists(fd, "elm-stuff");
+		rmIfExists(fd, "bower_components");
+		rmIfExists(fd, "node_modules");
 	}
-});
+}

package.json

@@ -31,9 +31,12 @@
     "command-exists": "^1.0.2",
     "fs-extra": "^0.30.0",
     "http-server": "^0.10.0",
-    "lodash": "^4.15.0"
+    "lodash": "^4.15.0",
+    "rimraf": "^2.6.2",
+    "semver": "^5.5.0"
   },
   "devDependencies": {
+    "npm-check-updates": "^2.14.2",
     "yargs": "^6.6.0"
   }
 }

updateFrameworks.js

@@ -32,18 +32,15 @@ async function main() {
                                     loglevel: 'silent'
                                 });
                                 if (upgraded) {
-                                    // console.log('ncu result', upgraded);
                                     let newVersion = upgraded[packageName];
+                                    if (newVersion && newVersion.startsWith('^')) newVersion = newVersion.substring(1);
+                                    if (newVersion &&  newVersion.startsWith('~')) newVersion = newVersion.substring(1);
                                     if (newVersion) {
-                                        console.log('new version', newVersion);
                                         if (!semver.satisfies(newVersion, '~'+version)) {
-                                            console.log(`Update ${packageName} old version is ${version}, new version ${newVersion}`);
+                                            console.log(`*** Update ${packageName} old version is ${version}, new version ${newVersion}`);
                                             mustRebuildFrameworks.push(p);
                                             await ncu.run({
                                                 packageFile: packageJSONFile,
-                                                silent: true,
-                                                jsonUpgraded: true,
-                                                loglevel: 'silent',
                                                 upgrade: true
                                             });
                                         }