Merge pull request #61 from r-park/chore

chore: misc. updates

Author: r-park

.babelrc

@@ -5,15 +5,15 @@
     "stage-0"
   ],
 
-  "plugins": [
-    "react-hot-loader/babel"
-  ],
-
   "env": {
-    "production": {
+    "development": {
       "plugins": [
-        "transform-react-constant-elements",
-        "transform-react-inline-elements"
+        "react-hot-loader/babel"
+      ]
+    },
+    "production": {
+      "presets": [
+        "react-optimize"
       ]
     }
   }

.eslintrc.yml

@@ -175,7 +175,7 @@ rules:
   no-undef-init: 2
   no-undefined: 0
   no-unexpected-multiline: 2
-  no-underscore-dangle: [2, {allowAfterThis: true}]
+  no-underscore-dangle: 0
   no-unmodified-loop-condition: 2
   no-unneeded-ternary: 0
   no-unreachable: 2
@@ -239,41 +239,46 @@ rules:
   react/display-name: 0
   react/forbid-prop-types: [2, {forbid: ["any"]}]
   react/jsx-boolean-value: 0
-  react/jsx-closing-bracket-location: [2, {nonEmpty: 'after-props'}]
+  react/jsx-closing-bracket-location: [2, {selfClosing: "tag-aligned", nonEmpty: "after-props"}]
   react/jsx-curly-spacing: [2, "never"]
   react/jsx-equals-spacing: [2, "never"]
+  react/jsx-filename-extension: 0
   react/jsx-first-prop-new-line: [2, "multiline"]
   react/jsx-handler-names: 0
   react/jsx-indent: [1, 2]
   react/jsx-indent-props: [1, 2]
   react/jsx-key: 2
   react/jsx-max-props-per-line: 0
   react/jsx-no-bind: [0, {ignoreRefs: true}]
+  react/jsx-no-comment-textnodes: 2
   react/jsx-no-duplicate-props: 2
   react/jsx-no-literals: 0
+  react/jsx-no-target-blank: 2
   react/jsx-no-undef: 2
   react/jsx-pascal-case: 2
   react/jsx-sort-props: 0
   react/jsx-space-before-closing: [2, "always"]
   react/jsx-uses-react: 1
   react/jsx-uses-vars: 1
+  react/jsx-wrap-multilines: 2
   react/no-danger: 1
   react/no-deprecated: 1
-  react/no-did-mount-set-state: [2, "allow-in-func"]
-  react/no-did-update-set-state: [2, "allow-in-func"]
+  react/no-did-mount-set-state: 2
+  react/no-did-update-set-state: 2
   react/no-direct-mutation-state: 2
+  react/no-find-dom-node: 2
   react/no-is-mounted: 2
   react/no-multi-comp: 1
+  react/no-render-return-value: 2
   react/no-set-state: 0
   react/no-string-refs: 2
   react/no-unknown-property: 2
   react/prefer-es6-class: 2
   react/prefer-stateless-function: 2
   react/prop-types: 2
-  react/react-in-jsx-scope: 1
-  react/require-extension: 1
+  react/react-in-jsx-scope: 2
+  react/require-optimization: 0
   react/require-render-return: 2
-  react/self-closing-comp: 2
+  react/self-closing-comp: 0
   react/sort-comp: 1
   react/sort-prop-types: 1
-  react/wrap-multilines: 2

README.md

@@ -12,7 +12,7 @@ A version of this app built with [redux-saga middleware](https://github.com/yelo
 ## Stack
 
 - React
-- React-Hot-Loader `3.0.0-beta.2`
+- React-Hot-Loader `3.0.0-beta.5`
 - React-Redux
 - React-Router
 - React-Router-Redux
@@ -78,15 +78,14 @@ $ firebase deploy
 ```
 
 
-NPM Command Summary
--------------------
+NPM Commands
+------------
 
 |Script|Description|
 |---|---|
-|`npm start`|Start webpack development server @ `localhost:3000`|
-|`npm run build`|Lint, test, and build the application to `./target`|
-|`npm run dev`|Same as `npm start`|
-|`npm run lint`|Lint `.js` files|
-|`npm run server`|Start express server @ `localhost:3000` to serve build artifacts from `./target` (must run `npm run build` first)|
-|`npm test`|Run unit tests with Karma and Jasmine|
-|`npm run test:watch`|Run unit tests with Karma and Jasmine; watch for changes to re-run tests|
+|npm start|Start webpack development server @ **localhost:3000**|
+|npm run build|Lint, test, and build the application to **./target**|
+|npm run lint|Lint **.js** files|
+|npm run server|Start express server @ **localhost:3000** to serve build artifacts from **./target** (must run **npm run build** first)|
+|npm test|Run unit tests with Karma and Jasmine|
+|npm run test:watch|Run unit tests with Karma and Jasmine; watch for changes to re-run tests|

circle.yml

@@ -1,6 +1,6 @@
 machine:
   node:
-    version: 6.1
+    version: 6.4
 
 dependencies:
   pre:

package.json

@@ -14,69 +14,70 @@
   "license": "MIT",
   "private": true,
   "engines": {
-    "node": ">=5.11"
+    "node": ">=6.4"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production webpack --display-chunks --progress",
-    "clean": "del-cli ./target",
-    "dev": "cross-env NODE_ENV=development webpack-dev-server --progress",
-    "lint": "eslint -c .eslintrc.yml *.js ./src ./server",
-    "prebuild": "npm-run-all clean lint test",
-    "server": "cross-env NODE_ENV=development nodemon -w 'server/**/*.*' ./server/main.js",
-    "start": "npm run dev",
+    "clean": "del-cli target",
+    "lint": "eslint -c .eslintrc.yml *.js src server",
+    "prebuild": "run-s clean lint test",
+    "server": "cross-env NODE_ENV=development nodemon -w 'server/**/*.*' server/main.js",
+    "server:dev": "cross-env NODE_ENV=development webpack-dev-server --progress",
+    "start": "npm run server:dev",
     "test": "cross-env NODE_ENV=test karma start --single-run",
     "test:watch": "cross-env NODE_ENV=test karma start"
   },
+  "dependencies": {
+    "babel-polyfill": "~6.13.0",
+    "classnames": "~2.2.5",
+    "immutable": "~3.8.1",
+    "react": "~15.3.2",
+    "react-dom": "~15.3.2",
+    "react-redux": "~4.4.5",
+    "react-router": "~2.8.1",
+    "react-router-redux": "~4.0.6",
+    "redux": "~3.6.0",
+    "redux-thunk": "~2.1.0",
+    "reselect": "~2.5.4"
+  },
   "devDependencies": {
-    "autoprefixer": "~6.3.6",
-    "babel-core": "~6.10.4",
-    "babel-eslint": "6.1.0",
-    "babel-loader": "~6.2.4",
-    "babel-plugin-transform-react-constant-elements": "~6.9.1",
-    "babel-plugin-transform-react-inline-elements": "~6.8.0",
-    "babel-polyfill": "~6.9.1",
-    "babel-preset-es2015": "~6.9.0",
+    "autoprefixer": "~6.4.1",
+    "babel-core": "~6.14.0",
+    "babel-eslint": "~6.1.2",
+    "babel-loader": "~6.2.5",
+    "babel-preset-es2015": "~6.14.0",
     "babel-preset-react": "~6.11.1",
+    "babel-preset-react-optimize": "~1.0.1",
     "babel-preset-stage-0": "~6.5.0",
-    "classnames": "~2.2.5",
-    "cross-env": "~1.0.8",
-    "css-loader": "~0.23.1",
+    "cross-env": "~3.0.0",
+    "css-loader": "~0.25.0",
     "del-cli": "~0.2.0",
-    "eslint": "~2.13.1",
-    "eslint-plugin-react": "~5.2.2",
+    "eslint": "~3.6.0",
+    "eslint-plugin-react": "~6.3.0",
     "express": "~4.14.0",
     "extract-text-webpack-plugin": "~1.0.1",
-    "firebase": "~3.1.0",
-    "firebase-tools": "3.0.4",
+    "firebase": "~3.4.0",
+    "firebase-tools": "3.0.7",
     "html-webpack-plugin": "~2.22.0",
-    "immutable": "~3.8.1",
-    "jasmine-core": "~2.4.1",
-    "karma": "~1.0.0",
-    "karma-chrome-launcher": "~1.0.1",
+    "jasmine-core": "~2.5.2",
+    "karma": "~1.3.0",
+    "karma-chrome-launcher": "~2.0.0",
     "karma-jasmine": "~1.0.2",
     "karma-sourcemap-loader": "~0.3.7",
-    "karma-webpack": "~1.7.0",
+    "karma-webpack": "~1.8.0",
     "minx": "r-park/minx.git",
     "morgan": "~1.7.0",
-    "node-sass": "~3.8.0",
-    "nodemon": "~1.9.2",
-    "npm-run-all": "~2.3.0",
-    "postcss-loader": "~0.9.1",
-    "react": "~15.2.0",
-    "react-addons-test-utils": "~15.2.0",
-    "react-dom": "~15.2.0",
-    "react-hot-loader": "3.0.0-beta.2",
-    "react-redux": "~4.4.5",
-    "react-router": "~2.5.2",
-    "react-router-redux": "~4.0.5",
-    "redux": "~3.5.2",
-    "redux-thunk": "~2.1.0",
-    "reselect": "~2.5.3",
-    "sass-loader": "~4.0.0",
-    "sinon": "~1.17.4",
+    "node-sass": "~3.10.0",
+    "nodemon": "~1.10.2",
+    "npm-run-all": "~3.1.0",
+    "postcss-loader": "~0.13.0",
+    "react-addons-test-utils": "~15.3.2",
+    "react-hot-loader": "3.0.0-beta.5",
+    "sass-loader": "~4.0.2",
+    "sinon": "~1.17.6",
     "style-loader": "~0.13.1",
-    "webpack": "~1.13.1",
-    "webpack-dev-server": "~1.14.1",
+    "webpack": "~1.13.2",
+    "webpack-dev-server": "~1.16.1",
     "webpack-md5-hash": "~0.0.5",
     "winston": "~2.2.0"
   }

server/main.js

@@ -6,14 +6,18 @@ const logger = require('winston');
 //  SETUP
 //---------------------------------------------------------
 const PROJECT_ROOT_DIR = process.cwd();
+const STATIC_DIR = `${PROJECT_ROOT_DIR}/target`;
+
+const HOST = '0.0.0.0';
+const PORT = 3000;
 
 const app = express();
 
 app.set('host', process.env.HOST || 'localhost');
 app.set('port', process.env.PORT || 3000);
 
 app.use(require('morgan')('dev'));
-app.use(express.static(`${PROJECT_ROOT_DIR}/target`));
+app.use(express.static(STATIC_DIR));
 
 
 //=========================================================
@@ -22,7 +26,7 @@ app.use(express.static(`${PROJECT_ROOT_DIR}/target`));
 const router = new express.Router();
 
 router.get('*', (req, res) => {
-  res.sendFile(`${PROJECT_ROOT_DIR}/target/index.html`);
+  res.sendFile(`${STATIC_DIR}/index.html`);
 });
 
 app.use(router);
@@ -31,11 +35,11 @@ app.use(router);
 //=========================================================
 //  START SERVER
 //---------------------------------------------------------
-app.listen(app.get('port'), app.get('host'), error => {
+app.listen(PORT, HOST, error => {
   if (error) {
     logger.error(error);
   }
   else {
-    logger.info(`Server listening @ ${app.get('host')}:${app.get('port')}`);
+    logger.info(`Server listening @ ${HOST}:${PORT}`);
   }
 });

src/core/auth/actions.js

@@ -1,3 +1,4 @@
+import firebase from 'firebase';
 import { firebaseAuth } from 'src/core/firebase';
 import {
   INIT_AUTH,

src/core/firebase/firebase.js

@@ -1,4 +1,4 @@
-import 'firebase';
+import firebase from 'firebase';
 import { firebaseConfig } from './config';
 
 

webpack.config.js

@@ -15,8 +15,8 @@ const ENV_DEVELOPMENT = NODE_ENV === 'development';
 const ENV_PRODUCTION = NODE_ENV === 'production';
 const ENV_TEST = NODE_ENV === 'test';
 
-const HOST = process.env.HOST || 'localhost';
-const PORT = process.env.PORT || 3000;
+const HOST = '0.0.0.0';
+const PORT = 3000;
 
 
 //=========================================================