Merge pull request #30 from JounQin/master

upgrade `extract-text-webpack-plugin` to ^2.0.0-beta to fix webpack ^2.0 issue(webpack-contrib/extract-text-webpack-plugin#210)

Author: hung-phan

.gitignore

@@ -6,4 +6,47 @@ node_modules/
 public/assets/
 tmp/
 coverage
-*.marko.js
+*.marko.js
+
+# IntelliJ project files
+*.iml
+out
+gen
+
+# Node template
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules
+jspm_packages
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history

package.json

@@ -4,7 +4,7 @@
   "devDependencies": {
     "babel-plugin-rewire": "^1.0.0-rc-4",
     "chai": "^3.5.0",
-    "chokidar-cli": "^1.2.0",
+    "chokidar": "^1.6.0",
     "enzyme": "^2.4.0",
     "eslint-watch": "^2.1.13",
     "flow-bin": "^0.28.0",
@@ -18,6 +18,7 @@
     "react-transform-catch-errors": "^1.0.2",
     "react-transform-hmr": "^1.0.4",
     "redbox-react": "^1.2.10",
+    "regenerator-runtime": "^0.9.5",
     "rewire": "^2.5.2",
     "sinon": "^1.17.4",
     "supertest": "^1.2.0"
@@ -58,7 +59,7 @@
     "estraverse-fb": "^1.3.1",
     "exports-loader": "^0.6.3",
     "expose-loader": "^0.7.1",
-    "extract-text-webpack-plugin": "^1.0.1",
+    "extract-text-webpack-plugin": "^2.0.0-beta.1",
     "faker": "^3.1.0",
     "file-loader": "^0.9.0",
     "font-awesome": "^4.6.3",
@@ -118,21 +119,21 @@
     "shelljs": "^0.7.0",
     "style-loader": "^0.13.1",
     "url-loader": "^0.5.7",
-    "webpack": "^2.1.0-beta.7",
-    "webpack-dev-server": "^2.0.0-beta",
+    "webpack": "^2.1.0-beta.17",
+    "webpack-dev-server": "^2.1.0-beta.0",
     "webpack-isomorphic-tools": "^2.3.2",
     "why-did-you-update": "0.0.8"
   },
   "scripts": {
-    "start": "sh scripts/start",
-    "debug": "sh scripts/debug",
-    "dev": "sh scripts/dev",
-    "build": "sh scripts/build",
-    "postinstall": "sh scripts/postinstall",
-    "test": "sh scripts/test",
-    "test:watch": "sh scripts/test-watch",
-    "test:coverage": "sh scripts/test-coverage",
-    "test:lint": "sh scripts/test-lint",
+    "start": "sh scripts/start.sh",
+    "debug": "sh scripts/debug.sh",
+    "dev": "sh scripts/dev.sh",
+    "build": "sh scripts/build.sh",
+    "postinstall": "sh scripts/postinstall.sh",
+    "test": "sh scripts/test.sh",
+    "test:watch": "sh scripts/test-watch.sh",
+    "test:coverage": "sh scripts/test-coverage.sh",
+    "test:lint": "sh scripts/test-lint.sh",
     "flow:status": "flow status; test $? -eq 0 -o $? -eq 2",
     "flow:watch": "npm run flow:status && chokidar './app/**/*.js' './tests/**/*.js' -c 'npm run flow:status'",
     "flow:stop": "flow stop",

scripts/build

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+gulp build

scripts/build.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 if [ -z "${NODE_ENV}" ]; then
   export NODE_ENV=${1:-production}
 fi

scripts/debug scripts/debug.shscripts/debug renamed to scripts/debug.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 if [ -z "${NODE_ENV}" ]; then
   export NODE_ENV=${1:-development}
 fi

scripts/dev scripts/dev.shscripts/dev renamed to scripts/dev.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 if [[ $NODE_ENV = "production" ]]; then
   gulp build
 fi

scripts/postinstall scripts/postinstall.shscripts/postinstall renamed to scripts/postinstall.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 if [ -z "${NODE_ENV}" ]; then
   export NODE_ENV=${1:-production}
 fi

scripts/start scripts/start.shscripts/start renamed to scripts/start.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 if [ -z "${NODE_ENV}" ]; then
   export NODE_ENV=${1:-test}
 fi

scripts/test-coverage scripts/test-coverage.shscripts/test-coverage renamed to scripts/test-coverage.sh

@@ -1 +1,2 @@
+#!/usr/bin/env bash
 esw -w 'app/**/*-test.js' 'tests/**/*.js'