Merge branch 'master' into sw-notifications

This commit is contained in:
Jinksi 2017-10-05 07:24:56 +10:00
commit 7df6eec585
4 changed files with 894 additions and 275 deletions

View file

@ -1,7 +1,10 @@
{
"parser": "babel-eslint",
"extends": ["standard", "standard-react"],
"env": {
"browser": true
},
"rules": {
"react/prop-types": "off",
"no-unused-vars": "warn"
}
}
}

View file

@ -3,12 +3,14 @@
"version": "0.1.1",
"private": true,
"devDependencies": {
"babel-eslint": "^8.0.1",
"eslint": "^4.8.0",
"eslint-config-standard": "^10.2.1",
"eslint-config-standard-react": "^5.0.0",
"eslint-plugin-import": "^2.3.0",
"eslint-plugin-node": "^5.0.0",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-node": "^5.2.0",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-react": "^7.1.0",
"eslint-plugin-react": "^7.4.0",
"eslint-plugin-standard": "^3.0.1",
"react-scripts": "^1.0.10",
"snazzy": "^7.0.0",
@ -17,8 +19,8 @@
},
"dependencies": {
"polished": "^1.2.1",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-helmet": "^5.1.3",
"react-markdown": "^2.5.0",
"react-router-dom": "^4.1.1",

View file

@ -13,7 +13,6 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,500,700">
<title>HyperStatic</title>
</head>

1149
yarn.lock

File diff suppressed because it is too large Load diff