Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
[![Twitter Follow](https://img.shields.io/twitter/follow/uruit.svg?style=social&label=Follow)](https://twitter.com/UruIT/followers)
[![Twitter URL](https://img.shields.io/twitter/url/http/uruit.react-seed.svg?style=social)](https://twitter.com/intent/tweet?text=react-seed%20by%20%40UruIT%20on&url=https%3A%2F%2Fgithub.com%2Furuit%2Freact-seed)

[![DevDependencies](https://img.shields.io/david/dev/uruit/react-seed.svg)](https://github.com/uruit/react-seed/blob/master/package.json)


UruIT seed project for ReactJS applications


Expand Down
2 changes: 1 addition & 1 deletion client/components/nav/Nav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { NavLink } from 'react-router-dom';
import styles from './Nav.scss';

let { nav, active } = styles;
const { nav, active } = styles;

const Nav = () => (
<ul className={nav}>
Expand Down
13 changes: 8 additions & 5 deletions client/components/nav/Nav.spec.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import React from 'react';
import Nav from './Nav';
import ShallowRenderer from 'react-test-renderer/shallow';

test('<Nav/>', () => {
const renderer = new ShallowRenderer();
const tree = renderer.render(<Nav />);
import Nav from './Nav';

describe('<Nav/>', () => {
it('snapshot', () => {
const renderer = new ShallowRenderer();
const tree = renderer.render(<Nav />);

expect(tree).toMatchSnapshot();
expect(tree).toMatchSnapshot();
});
});
4 changes: 3 additions & 1 deletion client/components/nav/__snapshots__/Nav.spec.js.snap
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`<Nav/> 1`] = `
exports[`<Nav/> snapshot 1`] = `
<ul
className="nav"
>
<li>
<NavLink
activeClassName="active"
ariaCurrent="true"
exact={true}
to="/"
>
Expand All @@ -16,6 +17,7 @@ exports[`<Nav/> 1`] = `
<li>
<NavLink
activeClassName="active"
ariaCurrent="true"
exact={true}
to="/about"
>
Expand Down
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"prop-types": "^15.5.9",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"react-router-dom": "^4.1.2",
"react-router-dom": "^4.2.0",
"whatwg-fetch": "^2.0.3"
},
"devDependencies": {
Expand Down
53 changes: 27 additions & 26 deletions client/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -918,23 +918,23 @@ hawk@~3.1.3:
hoek "2.x.x"
sntp "1.x.x"

history@^4.5.1, history@^4.6.0:
version "4.6.3"
resolved "https://registry.yarnpkg.com/history/-/history-4.6.3.tgz#6d723a8712c581d6bef37e8c26f4aedc6eb86967"
history@^4.7.2:
version "4.7.2"
resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"
dependencies:
invariant "^2.2.1"
loose-envify "^1.2.0"
resolve-pathname "^2.0.0"
value-equal "^0.2.0"
resolve-pathname "^2.2.0"
value-equal "^0.4.0"
warning "^3.0.0"

hoek@2.x.x:
version "2.16.3"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"

hoist-non-react-statics@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
hoist-non-react-statics@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.0.tgz#ede16318c2ff1f9fe3a025396ba06fd4c44608bb"

home-or-tmp@^2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -1855,7 +1855,7 @@ path-parse@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"

path-to-regexp@^1.5.3:
path-to-regexp@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
dependencies:
Expand Down Expand Up @@ -1966,24 +1966,25 @@ react-proxy@^1.1.7:
lodash "^4.6.1"
react-deep-force-update "^1.0.0"

react-router-dom@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.1.2.tgz#7f8a7ca868d32acadd19ca09543b40d26df8ec37"
react-router-dom@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.2.0.tgz#84238285ac31a1afe53c87a751b9f1ffc5b69af7"
dependencies:
history "^4.5.1"
history "^4.7.2"
invariant "^2.2.2"
loose-envify "^1.3.1"
prop-types "^15.5.4"
react-router "^4.1.1"
react-router "^4.2.0"

react-router@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.1.1.tgz#d448f3b7c1b429a6fbb03395099949c606b1fe95"
react-router@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.2.0.tgz#61f7b3e3770daeb24062dae3eedef1b054155986"
dependencies:
history "^4.6.0"
hoist-non-react-statics "^1.2.0"
history "^4.7.2"
hoist-non-react-statics "^2.3.0"
invariant "^2.2.2"
loose-envify "^1.3.1"
path-to-regexp "^1.5.3"
path-to-regexp "^1.7.0"
prop-types "^15.5.4"
warning "^3.0.0"

Expand Down Expand Up @@ -2115,9 +2116,9 @@ require-main-filename@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"

resolve-pathname@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.1.0.tgz#e8358801b86b83b17560d4e3c382d7aef2100944"
resolve-pathname@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"

resolve@1.1.7:
version "1.1.7"
Expand Down Expand Up @@ -2393,9 +2394,9 @@ validate-npm-package-license@^3.0.1:
spdx-correct "~1.0.0"
spdx-expression-parse "~1.0.0"

value-equal@^0.2.0:
version "0.2.1"
resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.2.1.tgz#c220a304361fce6994dbbedaa3c7e1a1b895871d"
value-equal@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7"

verror@1.3.6:
version "1.3.6"
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,38 +51,38 @@
},
"devDependencies": {
"autoprefixer": "^7.1.2",
"babel-core": "^6.25.0",
"babel-core": "^6.26.0",
"babel-eslint": "^7.2.3",
"babel-loader": "^7.1.1",
"babel-loader": "^7.1.2",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-survivejs-kanban": "^0.3.3",
"clean-webpack-plugin": "^0.1.16",
"coveralls": "^2.13.1",
"css-loader": "^0.28.4",
"eslint": "^4.3.0",
"css-loader": "^0.28.5",
"eslint": "^4.5.0",
"eslint-loader": "^1.9.0",
"eslint-plugin-react": "^7.1.0",
"eslint-plugin-react": "^7.3.0",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^0.11.2",
"html-webpack-plugin": "^2.29.0",
"html-webpack-plugin": "^2.30.1",
"html-webpack-template": "^6.0.1",
"http-server": "^0.10.0",
"husky": "^0.14.3",
"istanbul-instrumenter-loader": "^2.0.0",
"istanbul-instrumenter-loader": "^3.0.0",
"json-loader": "^0.5.6",
"lint-staged": "^4.0.2",
"lint-staged": "^4.0.3",
"node-sass": "^4.5.3",
"nodemon": "^1.11.0",
"npm-install-webpack-plugin": "^4.0.4",
"npm-install-webpack-plugin": "^4.0.5",
"plop": "^1.8.0",
"postcss-loader": "^2.0.6",
"raw-loader": "^0.5.1",
"resolve-url-loader": "^2.0.3",
"resolve-url-loader": "^2.1.0",
"sass-loader": "^6.0.6",
"style-loader": "^0.18.2",
"webpack": "^3.4.1",
"webpack-dev-middleware": "^1.11.0",
"webpack": "^3.5.5",
"webpack-dev-middleware": "^1.12.0",
"webpack-hot-middleware": "^2.18.2",
"webpack-merge": "^4.1.0"
},
Expand Down
6 changes: 3 additions & 3 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
"dependencies": {
"body-parser": "^1.17.2",
"compression": "^1.7.0",
"express": "^4.15.3",
"express": "^4.15.4",
"knex": "^0.13.0",
"pg": "^7.0.2",
"pg": "^7.2.0",
"winston": "^2.3.1"
},
"devDependencies": {
"supertest": "^3.0.0",
"tap-spec": "^4.1.1",
"tape": "^4.7.0"
"tape": "^4.8.0"
}
}
Loading