Merge branch 'master' of github.com:krausest/js-framework-benchmark

Author: krausest

package.json

@@ -19,8 +19,8 @@
     "install-server": "cd server && npm ci",
     "install-webdriver-ts-results": "cd webdriver-ts-results && npm ci",
     "install-local": "npm run install-webdriver-ts && npm run install-webdriver-ts-results && npm run install-server",
-    "rebuild": "node rebuild-single.js --",
-    "rebuild-ci": "node rebuild-single.js -- --ci",
+    "rebuild": "node rebuild-single.js",
+    "rebuild-ci": "node rebuild-single.js --ci",
     "zip": "node cli.js zip",
     "format": "prettier . \"!(broken-frameworks|frameworks)/**/*\" -w",
     "lint": "eslint . --ignore-pattern \"/broken-frameworks/\" --ignore-pattern \"/frameworks/\""

rebuild-build-single.js

@@ -37,8 +37,7 @@ const filesToDelete = [
   "bower_components",
   "node_modules",
   "output",
-  useCi && "package-lock.json",
-].filter(Boolean);
+].concat(useCi ? [] : ["package-lock.json"]);
 
 /*
 rebuild-single.js [--ci] [keyed/framework1 ... non-keyed/frameworkN]

rebuild-check-single.js

@@ -39,10 +39,10 @@ function runCommand(command, cwd = undefined) {
 
 try {
   const benchCmd = `npm run bench -- --headless true --smoketest true ${frameworkNames}`;
-  runCommand(benchCmd);
+  runCommand(benchCmd, "webdriver-ts");
 
   const keyedCmd = `npm run isKeyed -- --headless true ${frameworkNames}`;
-  runCommand(keyedCmd);
+  runCommand(keyedCmd, "webdriver-ts");
 
   console.log("rebuild-check-single.js finished");
   console.log("All checks are fine!");

rebuild-single.js

@@ -25,7 +25,7 @@ const frameworks = args._.filter((arg) => !arg.startsWith("--"));
 const frameworksNames = frameworks.join(" ");
 
 console.log(
-  "args",
+  "rebuild-single.js args",
   args,
   "ci",
   useCi,
@@ -64,7 +64,7 @@ try {
     process.exit(1);
   }
 
-  const buildCmd = `node rebuild-build-single.js ${frameworksNames}`;
+  const buildCmd = `node rebuild-build-single.js ${useCi ? '--ci' : ''} ${frameworksNames}`;
   runCommand(buildCmd);
 
   const checkCmd = `node rebuild-check-single.js ${frameworksNames}`;