Skip to content

Commit

Permalink
Merge 8298006 into 2241f62
Browse files Browse the repository at this point in the history
  • Loading branch information
XROLE committed Feb 6, 2019
2 parents 2241f62 + 8298006 commit 47d3c8b
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 34 deletions.
7 changes: 2 additions & 5 deletions .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,12 @@
"ignore": ["stylelint-commands", "after-comment"]
} ],
"declaration-colon-space-after": "always",
"indentation": ["tab", {
"except": ["value"]
}],
"max-empty-lines": 2,
"rule-empty-line-before": [ "always", {
"except": ["first-nested"],
"ignore": ["after-comment"]
} ],
"unit-whitelist": ["em", "rem", "%"]

"unit-whitelist": ["em", "rem", "%"],
}
}

9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,19 @@
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react-redux": "^6.0.0",
"react-router-dom": "^4.3.1",
"redux": "^4.0.1",
"sass-loader": "^7.1.0",
"style-loader": "^0.23.1",
"terser": "^3.14.1",
"webpack": "^4.29.0",
"webpack-cli": "^3.2.1",
"terser": "^3.14.1"
"webpack-cli": "^3.2.1"
},
"devDependencies": {
"@babel/core": "^7.2.2",
"@babel/preset-env": "^7.3.1",
"@babel/preset-react": "^7.0.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.0.0",
"babel-loader": "^8.0.5",
"coveralls": "^3.0.2",
Expand All @@ -54,11 +56,12 @@
"eslint-plugin-prettier": "^3.0.1",
"eslint-plugin-react": "^7.12.4",
"html-webpack-plugin": "^3.2.0",
"babel-eslint": "^10.0.1",
"husky": "^1.3.1",
"jest": "^24.0.0",
"prettier": "1.16.4",
"pretty-quick": "^1.10.0",
"stylelint": "^9.10.1",
"stylelint-config-standard": "^18.2.0",
"stylelint-webpack-plugin": "^0.10.5",
"webpack-dev-server": "^3.1.14"
},
Expand Down
22 changes: 10 additions & 12 deletions src/app/App.jsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import React from 'react';
import {
BrowserRouter as Router,
Route
} from 'react-router-dom';
import { Home } from './home';
import React from 'react'
import { BrowserRouter as Router, Route, Switch } from 'react-router-dom'
import { Home } from './home'

const App = () => (
<Router >
<Route path='/' component={Home} />
</Router>
<Router>
<Switch>
<Route path="/" component={Home} />
</Switch>
</Router>
)

);

export default App;
export default App
11 changes: 0 additions & 11 deletions src/components/LandingPage.js

This file was deleted.

10 changes: 7 additions & 3 deletions webpack/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ plugins:[
{
template: './public/index.html'
}

),
new StyleLintPlugin({
configFile: '.stylelintrc',
Expand All @@ -41,7 +42,10 @@ plugins:[
quiet: false
})
],
resolve: {
extensions: ['.js', '.jsx'],
}
resolve: {
extensions: ['.js', '.jsx'],
},
devServer: {
historyApiFallback: true,
}
}

0 comments on commit 47d3c8b

Please sign in to comment.