chore: various fixes after rebase.

Author: arjunkathuria

package.json

@@ -33,8 +33,8 @@
   "dependencies": {},
   "devDependencies": {
     "babel-preset-es2015-rollup": "^1.1.1",
-    "blanket": "^1.2.3",
     "bannerize": "^1.0.2",
+    "blanket": "^1.2.3",
     "changelogplease": "^1.2.0",
     "ember-suave": "^4.0.0",
     "git-tags": "^0.2.4",
@@ -51,13 +51,12 @@
     "hammer-simulator": "git://github.com/hammerjs/simulator#master",
     "jquery": "^3.1.0",
     "jquery-hammerjs": "2.0.x",
-    "lodash-compat": "^3.10.2",
-    "qunitjs": "^2.0.0",
     "jscs": "^3.0.7",
     "jshint": "^2.9.2",
     "jshint-stylish": "^2.2.0",
+    "lodash-compat": "^3.10.2",
     "node-qunit-phantomjs": "^1.4.0",
-    "replace": "^0.3.0",
+    "qunitjs": "^2.0.0",
     "rollup": "^0.26.3",
     "rollup-plugin-babel": "^2.4.0",
     "run-when-changed": "^1.2.0",
@@ -74,10 +73,10 @@
     "rollup": "rollup -c",
     "uglify": "uglifyjs hammer.js --source-map hammer.min.js.map -o hammer.min.js --stats",
     "string-replace": "node string-replace.js",
-    "jshint": "jshint hammer.js --config .jshintrc --verbose --reporter=node_modules/jshint-stylish",
-    "jscs": " jscs src/**/*.js --config=./.jscsrc",
+    "jshint": "jshint src/**/*.js hammer.js tests/unit/*.js tests/unit/gestures/*.js --config .jshintrc --verbose --reporter=node_modules/jshint-stylish",
+    "jscs": " jscs src/**/*.js tests/unit/*.js tests/unit/gestures/*.js --config=./.jscsrc",
     "qunit": "phantomjs node_modules/qunit-phantomjs-runner/runner-list.js tests/unit/index.html 15",
-    "watch": "run-when-changed --watch 'src/**/*.js' --exec 'npm run watch-tasks'",
+    "watch": "run-when-changed --watch 'src/**/*.js' --watch 'tests/unit/*.js' --watch 'tests/unit/gestures/*.js' --exec 'npm run watch-tasks'",
     "watch-tasks": "npm run rollup && npm run string-replace && npm run uglify && npm run jshint && npm run jscs",
     "test": "npm run jshint && npm run jscs && npm run qunit",
     "build": "npm run rollup && npm run string-replace && npm run uglify && npm run bannerize && npm run test",

rollup.config.js

@@ -5,6 +5,6 @@ export default {
   format: 'es6',
   plugins: [ babel({exclude: 'node_modules/**'}) ],
   dest: 'hammer.js',
-  intro: " (function(window, document, exportName, undefined) { \n'use strict'; ",
+  intro: " (function(window, document, exportName, undefined) { \n'use strict';",
   outro: "})(window, document, 'Hammer');"
 };

string-replace.js

@@ -1,11 +1,12 @@
-var fs = require('fs');
-var pkg = require('./package.json');
+const fs = require('fs');
+const pkg = require('./package.json');
 
-var hammer = fs.readFileSync('hammer.js','utf8');
-hammer = hammer.replace(/{{PKG_VERSION}}/g,pkg.version)
+let hammer = fs.readFileSync('hammer.js', 'utf8');
+hammer = hammer.replace(/{{PKG_VERSION}}/g, pkg.version);
 
-fs.writeFile('hammer.js', hammer,'utf8',function (err) {
-  if(err)
-    throw err
-  console.log("String Replaced");
-})
+fs.writeFile('hammer.js', hammer, 'utf8', (err) => {
+  if (err) {
+    throw err;
+  }
+  console.log('String Replaced!');
+});