Merge pull request krausest#201 from alexteves/travis-use-yarn

Use yarn and node 7 in travis

Author: krausest

.gitignore

@@ -48,7 +48,10 @@ marko-*/static
 marko-*/build
 marko-*/src/xtable.marko
 
-yarn.lock
+# keep root yarn.lock in repo so that travis will install yarn
+yarn.lock 
+!/yarn.lock
+
 package-lock.json
 
 # angular 2 aot

.travis.yml

@@ -1,7 +1,5 @@
-language: node_js
-node_js:
-  - "node"
-install: 
-  - npm install
-script:
-  - npm run build-prod
+language : node_js
+node_js  : 7
+cache    : yarn
+install  : yarn
+script   : npm run build-prod

install.js

@@ -7,9 +7,9 @@ var installCommand = 'npm install';
 
 var excludedDirectories = ['css', 'dist','node_modules','webdriver-java'];
 
-// commandExists('yarn', function(err, commandExists) {
+commandExists('yarn', function(err, commandExists) {
 
-// 	installCommand = commandExists ? 'yarn' : 'npm install';
+	installCommand = commandExists ? 'yarn' : 'npm install';
 
 	_.each(fs.readdirSync('.'), function(name) {
 		if(fs.statSync(name).isDirectory() && name[0] !== '.' && excludedDirectories.indexOf(name)==-1) {
@@ -20,4 +20,4 @@ var excludedDirectories = ['css', 'dist','node_modules','webdriver-java'];
 			});
 		}
 	});
-// });
+});

webdriver-ts-results/src/Common.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-var jStat:any = require('jstat').jStat;
+var jStat:any = require('jStat').jStat;
 
 export interface Framework {
     name: string;