Merge branch 'master' into improve-cli

Author: nakrovati

README.md

@@ -520,6 +520,10 @@ You can set an optional different URL if needed or specify that your DOM uses a
 
 ## 4.4 Submitting your implementation
 
+Please take a look at https://github.com/krausest/js-framework-benchmark/wiki/Process-for-merging-a-pull-request for informations how pull requests are merged.
+
+
+
 Contributions are very welcome. Please use the following rules:
 
 - Name your directory frameworks/[keyed|non-keyed]/[FrameworkName]
@@ -531,7 +535,7 @@ Contributions are very welcome. Please use the following rules:
 - Webdriver-ts must be able to run the perf tests for the contribution. This means that all buttons (like "Create 1,000 rows") must have the correct id e.g. like in vanillajs. Using shadow DOM is a real pain for webdriver. The closer you can get to polymer the higher the chances I can make that contribution work.
 - Don't change the ids in the index.html, since the automated benchmarking relies on those ids.
 - Please push only files in your framework folder (not index.html or results.json)
-- **Please make sure your implementation is validated by the test tool.** cd to webdriver-ts and invoke it with `npm run isKeyed [keyed|non-keyed]/[FrameworkName]`. It'll print an error if your framework behaves other as specified. It'll print a big ERROR explaining if it isn't happy with the implementation. Some common errors include:
+- **Please make sure your implementation is validated by the test tool.** cd to the root directory and perform a check  `npm run rebuild-ci [keyed|non-keyed]/[FrameworkName]`. It'll print an error if your framework doesn't build, the benchmark can't be run or behaves other as specified. It'll print a big ERROR explaining if it isn't happy with the implementation. Some common errors include:
   - Your package.json is missing some required fields
   - Incorrect classification (Keyed/NonKeyed)
   - You have gzipped files in /dist (unfortunately the web server prefers these when they exist)

cli/zip.js

@@ -56,7 +56,15 @@ function addFrameworksToZip(frameworkType, frameworkDir, frameworkName) {
   if (frameworkName === "halogen") {
     addLocalFileIfExists(`${frameworkDir}/output/bundle.js`, `${zipFrameworkPath}/output`);
   } else if (frameworkName === "dojo") {
-    addLocalFolderIfExists(`${frameworkDir}/output/dist`, `${zipFrameworkPath}/output/dist`);
+    addLocalFolderIfExists(
+      `${frameworkDir}/output/dist`,
+      `${zipFrameworkPath}/output/dist`,
+    );
+  } else if (frameworkName === "s2") {
+    addLocalFolderIfExists(
+      `${frameworkDir}/node_modules/s2-engine/dist`,
+      `${zipFrameworkPath}/node_modules/s2-engine/dist`,
+    );
   } else if (frameworkName === "stem") {
     addLocalFolderIfExists(
       `${frameworkDir}/node_modules/babel-polyfill/dist`,