Merge pull request microsoft#68 from johnnyreilly/master

Replaced gulp-connect with express to fix caching

Author: mhegazy

es6-babel-react-flux-karma/gulp/.eslintrc

@@ -32,7 +32,7 @@
         "no-shadow": 2,
         "no-shadow-restricted-names": 2,
         "no-spaced-func": 2,
-        "no-trailing-spaces": 2,
+        "no-trailing-spaces": 1,
         "no-undef-init": 2,
         "no-unused-expressions": 2,
         "no-use-before-define": [2, "nofunc"],

es6-babel-react-flux-karma/gulp/inject.js

@@ -21,7 +21,7 @@ function injectIndex(options) {
   var jsCssGlob = 'dist/**/*.{js,css}';
 
   function checkForInitialFilesThenRun() {
-    glob(jsCssGlob, options, function (er, files) {
+    glob(jsCssGlob, function (er, files) {
       var filesWeNeed = ['dist/scripts/main', 'dist/scripts/vendor'/*, 'dist/styles/main'*/];
 
       function fileIsPresent(fileWeNeed) {

es6-babel-react-flux-karma/gulpFile.js

@@ -3,7 +3,6 @@
 
 var gulp = require('gulp');
 var gutil = require('gulp-util');
-var connect = require('gulp-connect');
 var eslint = require('gulp-eslint');
 var webpack = require('./gulp/webpack');
 var staticFiles = require('./gulp/staticFiles');
@@ -39,14 +38,15 @@ gulp.task('lint', function () {
     .pipe(eslint.format());
 });
 
-gulp.task('watch', ['delete-dist'], function() {
+gulp.task('watch', ['delete-dist'], function(done) {
   process.env.NODE_ENV = 'development';
   Promise.all([
     webpack.watch()//,
     //less.watch()
   ]).then(function() {
     gutil.log('Now that initial assets (js and css) are generated inject will start...');
     inject.watch();
+    done();
   }).catch(function(error) {
     gutil.log('Problem generating initial assets (js and css)', error);
   });
@@ -57,8 +57,10 @@ gulp.task('watch', ['delete-dist'], function() {
 });
 
 gulp.task('watch-and-serve', ['watch'], function() {
-  connect.server({
-    root: './dist',
-    port: 8080
-  });
+  // local as not required for build
+  var express = require('express')
+  var app = express()
+
+  app.use(express.static('dist', {'index': 'index.html'}))
+  app.listen(8080);
 });

es6-babel-react-flux-karma/package.json

@@ -34,12 +34,12 @@
     "babel-preset-react": "^6.0.0",
     "del": "^2.0.2",
     "eslint": "^1.6.0",
+    "express": "^4.13.3",
     "flux": "^2.0.3",
     "glob": "^5.0.15",
     "gulp": "^3.9.0",
     "gulp-autoprefixer": "^3.1.0",
     "gulp-cached": "^1.1.0",
-    "gulp-connect": "^2.2.0",
     "gulp-cssmin": "^0.1.7",
     "gulp-eslint": "^1.0.0",
     "gulp-if": "^2.0.0",
@@ -61,7 +61,6 @@
     "karma-webpack": "^1.7.0",
     "phantomjs": "^1.9.17",
     "react": "^0.14.3",
-    "ts-loader": "^0.6.0",
     "react-addons-test-utils": "^0.14.3",
     "react-dom": "^0.14.3",
     "ts-loader": "^0.7.1",