Skip to content

Commit

Permalink
Merge pull request #26 from choonchernlim/feature/dep
Browse files Browse the repository at this point in the history
Feature/dep
  • Loading branch information
choonchernlim authored Apr 4, 2019
2 parents c5a7db6 + fefe6f4 commit 0bc407b
Show file tree
Hide file tree
Showing 8 changed files with 1,673 additions and 1,286 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
.flowconfig text
.gitattributes text
.gitignore text
.huskyrc text
.lintstagedrc text
.nycrc text
.prettierignore text
.prettierrc text
Expand Down
5 changes: 5 additions & 0 deletions .huskyrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"hooks": {
"pre-commit": "lint-staged"
}
}
6 changes: 6 additions & 0 deletions .lintstagedrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"*.{js,json,md}": [
"prettier --write",
"git add"
]
}
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

## 0.16.0 - 2019-04-03

- Externalized husky config from `package.json` into `.huskyrc` and `.lintstagedrc`.
- Dependency update.

## 0.15.0 - 2018-12-28

- Replaced `react-router-redux` with `connected-react-router` because the earlier won't work with Redux v6.
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ These commands are cross-platform compatible.
| sinon | Test - Standalone test spies, stubs and mocks |
| url-loader | Webpack - URL loader |
| webpack | Webpack - Core |
| webpack-cli | Webpack - CLI |
| webpack-dev-server | Webpack - Node.js Express server |

## Project Structure
Expand All @@ -162,6 +163,8 @@ These commands are cross-platform compatible.
├── .flowconfig -> Flow configuration
├── .gitattributes -> Custom Git configuration
├── .gitignore -> Git ignore list
├── .huskyrc -> Husky configuration
├── .lintstagedrc -> Lint staged configuration
├── .nycrc -> Istanbul CLI configuration
├── .prettierignore -> Prettier ignore list
├── .prettierrc -> Prettier configuration
Expand Down
107 changes: 48 additions & 59 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "front-end-stack",
"version": "0.15.0",
"version": "0.16.0",
"private": true,
"sideEffects": false,
"config": {
Expand All @@ -25,87 +25,76 @@
"prettier": "prettier --write '**/*.{js,json,md}'"
},
"dependencies": {
"@material-ui/core": "3.7.1",
"@material-ui/icons": "3.0.1",
"@material-ui/core": "3.9.3",
"@material-ui/icons": "3.0.2",
"classnames": "2.2.6",
"connected-react-router": "6.1.0",
"connected-react-router": "6.3.2",
"date-fns": "1.30.1",
"history": "4.7.2",
"immer": "1.9.3",
"prop-types": "15.6.2",
"react": "16.7.0",
"react-dom": "16.7.0",
"react-redux": "6.0.0",
"react-router-dom": "4.3.1",
"history": "4.9.0",
"immer": "2.1.4",
"prop-types": "15.7.2",
"react": "16.8.6",
"react-dom": "16.8.6",
"react-redux": "6.0.1",
"react-router-dom": "5.0.0",
"recompose": "0.30.0",
"redux": "4.0.1",
"redux-observable": "1.0.0",
"redux-observable": "1.1.0",
"reselect": "4.0.0",
"rxjs": "6.3.3",
"rxjs": "6.4.0",
"typeface-roboto": "0.0.54"
},
"devDependencies": {
"@babel/cli": "7.2.3",
"@babel/core": "7.2.2",
"@babel/plugin-proposal-class-properties": "7.2.3",
"@babel/cli": "7.4.3",
"@babel/core": "7.4.3",
"@babel/plugin-proposal-class-properties": "7.4.0",
"@babel/plugin-proposal-export-default-from": "7.2.0",
"@babel/polyfill": "7.2.5",
"@babel/preset-env": "7.2.3",
"@babel/polyfill": "7.4.3",
"@babel/preset-env": "7.4.3",
"@babel/preset-flow": "7.0.0",
"@babel/preset-react": "7.0.0",
"@babel/register": "7.0.0",
"autoprefixer": "9.4.3",
"@babel/register": "7.4.0",
"autoprefixer": "9.5.0",
"babel-eslint": "10.0.1",
"babel-loader": "8.0.4",
"babel-plugin-istanbul": "5.1.0",
"babel-loader": "8.0.5",
"babel-plugin-istanbul": "5.1.1",
"chai": "4.2.0",
"chai-as-promised": "7.1.1",
"clean-webpack-plugin": "1.0.0",
"clean-webpack-plugin": "2.0.1",
"compression-webpack-plugin": "2.0.0",
"css-loader": "2.1.0",
"enzyme": "3.8.0",
"enzyme-adapter-react-16": "1.7.1",
"eslint": "5.11.1",
"css-loader": "2.1.1",
"enzyme": "3.9.0",
"enzyme-adapter-react-16": "1.11.2",
"eslint": "5.16.0",
"eslint-config-airbnb": "17.1.0",
"eslint-config-prettier": "3.3.0",
"eslint-loader": "2.1.1",
"eslint-plugin-flowtype": "3.2.0",
"eslint-plugin-import": "2.14.0",
"eslint-plugin-jsx-a11y": "6.1.2",
"eslint-config-prettier": "4.1.0",
"eslint-loader": "2.1.2",
"eslint-plugin-flowtype": "3.5.1",
"eslint-plugin-import": "2.16.0",
"eslint-plugin-jsx-a11y": "6.2.1",
"eslint-plugin-prettier": "3.0.1",
"eslint-plugin-react": "7.12.0",
"eslint-plugin-react": "7.12.4",
"file-loader": "3.0.1",
"flow-bin": "0.89.0",
"flow-bin": "0.96.0",
"html-webpack-plugin": "3.2.0",
"husky": "1.3.1",
"image-webpack-loader": "4.6.0",
"jsdom": "13.1.0",
"lint-staged": "8.1.0",
"jsdom": "14.0.0",
"lint-staged": "8.1.5",
"mini-css-extract-plugin": "0.5.0",
"mocha": "5.2.0",
"mocha-junit-reporter": "1.18.0",
"nock": "10.0.5",
"nodemon": "1.18.9",
"nyc": "13.1.0",
"mocha": "6.0.2",
"mocha-junit-reporter": "1.21.0",
"nock": "10.0.6",
"nodemon": "1.18.10",
"nyc": "13.3.0",
"postcss-loader": "3.0.0",
"prettier": "1.15.3",
"react-test-renderer": "16.7.0",
"rimraf": "2.6.2",
"sinon": "7.2.2",
"prettier": "1.16.4",
"react-test-renderer": "16.8.6",
"rimraf": "2.6.3",
"sinon": "7.3.1",
"url-loader": "1.1.2",
"webpack": "4.28.2",
"webpack-cli": "3.1.2",
"webpack-dev-server": "3.1.14"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.{js,json,md}": [
"prettier --write",
"git add"
]
"webpack": "4.29.6",
"webpack-cli": "3.3.0",
"webpack-dev-server": "3.2.1"
}
}
9 changes: 2 additions & 7 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const baseConfig = require('./webpack.base.config');
const path = require('path');
const webpack = require('webpack');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const CleanPlugin = require('clean-webpack-plugin');
const CleanWebpackPlugin = require('clean-webpack-plugin');
const CompressionPlugin = require('compression-webpack-plugin');
const packageJson = require('./package.json');
const process = require('process');
Expand Down Expand Up @@ -30,12 +30,7 @@ module.exports = Object.assign({}, baseConfig.webpackOptions, {
},

plugins: baseConfig.webpackOptions.plugins.concat([
// Instead of cleaning whole dist dir between builds, clean only dirs that may contain
// hashed filenames
new CleanPlugin(['css', 'font', 'img', 'js'], {
root: distPath,
verbose: false,
}),
new CleanWebpackPlugin(),

// To prevent the following warnings in browser console:-
// "It looks like you're using a minified copy of the development build of React.
Expand Down
Loading

0 comments on commit 0bc407b

Please sign in to comment.