fixed build error(downgrade image-wepback-loader for now) & renamed f…

…older __tests__ to tests

.dockerignore

@@ -1,11 +1,22 @@
-.idea/
-.vscode/
-.awcache/
-node_modules/
-frontend/dist/
-dist.zip
+# General
+.DS_Store
+*~
 *.swp
 *.log
-.DS_Store
+
+# Editor config folder
+.idea/
+.vscode/
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# Code coverage
 coverage/
 .coveralls.yml
+
+# Misc
+.awcache/
+node_modules/
+dist/

.editorconfig

@@ -6,11 +6,16 @@ root = true
 # Unix-style newlines with a newline ending every file
 [*]
 charset = utf-8
+end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-# Indentation override for js, ts and config files
-[*.{js,jsx,ts,tsx,json,yml}]
+# Trailing space override for markdown file
+[*.md]
+trim_trailing_whitespace = false
+
+# Indentation override for js(x), ts(x) files
+[*.{js,jsx,ts,tsx}]
 indent_size = 2
 indent_style = space
 
@@ -23,3 +28,13 @@ indent_style = space
 [*.html]
 indent_size = 2
 indent_style = space
+
+# Indentation override for config files
+[*.{json,yml}]
+indent_size = 2
+indent_style = space
+
+# Minified JavaScript files shouldn't be changed
+[**.min.js]
+indent_style = ignore
+insert_final_newline = ignore

.eslintignore

@@ -1,3 +1,3 @@
 node_modules/
-frontend/dist/
+dist/
 coverage/

.gitignore

@@ -1,10 +1,22 @@
-.idea/
-.vscode/
-.awcache/
-node_modules/
-frontend/dist/
+# General
+.DS_Store
+*~
 *.swp
 *.log
-.DS_Store
+
+# Editor config folder
+.idea/
+.vscode/
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# Code coverage
 coverage/
 .coveralls.yml
+
+# Misc
+.awcache/
+node_modules/
+dist/

.stylelintignore

@@ -1,3 +1,3 @@
 node_modules/
-frontend/dist/
+dist/
 coverage/

README.md

@@ -2,9 +2,9 @@
 
 [![Dependency Status](https://david-dm.org/Armour/express-webpack-react-redux-typescript-boilerplate/status.svg)](https://david-dm.org/Armour/express-webpack-react-redux-typescript-boilerplate)
 [![DevDependency Status](https://david-dm.org/Armour/express-webpack-react-redux-typescript-boilerplate/dev-status.svg)](https://david-dm.org/Armour/express-webpack-react-redux-typescript-boilerplate?type=dev)
-[![CircleCI](https://circleci.com/gh/Armour/express-webpack-react-redux-typescript-boilerplate/tree/master.svg?style=shield&circle-token=2b60a5e48d4f53d2b115efd948022c7df72a805b)](https://circleci.com/gh/Armour/express-webpack-react-redux-typescript-boilerplate/tree/master)
+[![CircleCI](https://circleci.com/gh/Armour/express-webpack-react-redux-typescript-boilerplate/tree/master.svg?style=shield)](https://circleci.com/gh/Armour/express-webpack-react-redux-typescript-boilerplate/tree/master)
 [![Appveyor](https://ci.appveyor.com/api/projects/status/kgnfn2r88h90cgx5?svg=true)](https://ci.appveyor.com/api/projects/status/kgnfn2r88h90cgx5?svg=true)
-[![Coverage Status](https://coveralls.io/repos/github/Armour/express-webpack-react-redux-typescript-boilerplate/badge.svg?branch=master&t=H7lCqC)](https://coveralls.io/github/Armour/express-webpack-react-redux-typescript-boilerplate?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/Armour/express-webpack-react-redux-typescript-boilerplate/badge.svg?branch=master)](https://coveralls.io/github/Armour/express-webpack-react-redux-typescript-boilerplate?branch=master)
 [![tested with jest](https://img.shields.io/badge/tested_with-jest-99424f.svg)](https://github.com/facebook/jest)
 [![MIT Licence](https://badges.frapsoft.com/os/mit/mit.svg?v=103)](https://opensource.org/licenses/mit-license.php)
 

circle.yml

@@ -24,7 +24,7 @@ jobs:
           name: Install Docker Compose
           command: |
             set -x
-            VER="1.21.1"
+            VER="1.21.2"
             curl -L https://github.com/docker/compose/releases/download/$VER/docker-compose-`uname -s`-`uname -m` > /tmp/docker-compose
             sudo cp /tmp/docker-compose /usr/local/bin/docker-compose
             sudo chmod +x /usr/local/bin/docker-compose

frontend/src/types/index.d.ts

@@ -13,12 +13,12 @@ export { ITodoInputDispatchProps } from 'components/TodoInput';
 export { IFilterLinkProps } from 'containers/FilterLink';
 
 // Global State
-export type IAppState = {
+export interface IAppState {
   todos: ITodoList;
   visibilityFilter: IVisibilityFilterOption;
   fetching: IFetchingSet;
   noteData: INoteDataMap;
-};
+}
 
 // Todos
 export interface ITodo {

package.json

@@ -14,9 +14,9 @@
     "build-prod": "yarn build-dll && webpack --config webpack.config.prod.babel.js",
     "profile": "yarn build-dll && webpack --config webpack.config.profile.babel.js",
     "server": "nodemon --exec babel-node backend/server.js",
-    "eslint": "eslint -f codeframe \"**/*.js\" \"**/*.jsx\" ",
-    "tslint": "tslint -t codeFrame -e \"node_modules/**\" \"**/*.ts(x)\" \"**/*.tsx\" ",
-    "stylelint": "stylelint \"**/*.css **/*.scss\" ",
+    "eslint": "eslint -f codeframe \"**/*.js\" \"**/*.jsx\"",
+    "tslint": "tslint -t codeFrame -e \"node_modules/**\" \"**/*.ts\" \"**/*.tsx\"",
+    "stylelint": "stylelint \"**/*.css **/*.sass **/*.scss\"",
     "clean": "rm -rf frontend/dist .awcache coverage",
     "test": "jest --no-cache --coverage",
     "coverage": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls",
@@ -78,7 +78,7 @@
     "history": "4.7.2",
     "html-webpack-plugin": "3.2.0",
     "husky": "0.14.3",
-    "image-webpack-loader": "4.2.0",
+    "image-webpack-loader": "3.6.0",
     "immutable": "4.0.0-rc.9",
     "jest": "22.4.3",
     "lodash": "4.17.10",
@@ -149,13 +149,13 @@
     "transform": {
       "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
-    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js|jsx)$",
+    "testRegex": "(/tests/.*|\\.(test|spec))\\.(ts|tsx|js|jsx)$",
     "testPathIgnorePatterns": [
       "node_modules"
     ],
     "coveragePathIgnorePatterns": [
       "node_modules",
-      "_tests_"
+      "tests"
     ],
     "moduleDirectories": [
       "node_modules",