Skip to content

Commit

Permalink
Merge branch 'master' of github.com:usehenri/henri into refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
reel committed Aug 2, 2017
2 parents c6fb13c + 6cf556f commit df6ed6c
Show file tree
Hide file tree
Showing 25 changed files with 1,486 additions and 863 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
</a>

# henri - the versatile javascript framework
[![NPM](https://nodei.co/npm/henri.svg?downloads=true&downloadRank=true)](https://nodei.co/npm/henri/)

[![npm version](https://img.shields.io/npm/v/henri.svg?style=flat-square)](https://www.npmjs.com/package/henri)
[![npm downloads](https://img.shields.io/npm/dm/henri.svg?style=flat-square)](https://www.npmjs.com/package/henri)
[![Build Status](https://travis-ci.org/usehenri/henri.svg?branch=master)](https://travis-ci.org/usehenri/henri)
[![Coverage Status](https://coveralls.io/repos/github/usehenri/henri/badge.svg)](https://coveralls.io/github/usehenri/henri)
[![Join slack](http://slack.usehenri.io/badge.svg)](http://slack.usehenri.io/)

henri is an easy to learn rails-like, server-side rendered (react & vue) with powerful ORMs

Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@
"test:watch": "NODE_CONFIG_DIR=./packages/config/tests/config jest --coverage --runInBand --verbose --bail --watch --notify"
},
"devDependencies": {
"@types/jest": "^20.0.2",
"@types/jest": "^20.0.5",
"coveralls": "^2.13.1",
"eslint": "^4.2.0",
"eslint": "^4.3.0",
"eslint-config-standard": "^10.2.1",
"eslint-plugin-import": "^2.6.1",
"eslint-plugin-jest": "^20.0.3",
"eslint-plugin-node": "^5.0.0",
"eslint-plugin-node": "^5.1.1",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-standard": "^3.0.1",
"husky": "^0.14.3",
"jest": "^20.0.4",
"lerna": "^2.0.0",
"lint-staged": "^4.0.0",
"lint-staged": "^4.0.2",
"next": "3.0.1-beta.16",
"nuxt": "^1.0.0-alpha.5",
"nyc": "^11.0.3",
"prettier": "^1.5.2",
"nyc": "^11.1.0",
"prettier": "^1.5.3",
"react": "^15.6.1",
"react-dom": "^15.6.1"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
"@usehenri/view": "^0.15.5",
"chalk": "^2.0.1",
"cross-spawn": "^5.1.0",
"fs-extra": "^3.0.1",
"fs-extra": "^4.0.1",
"minimist": "^1.2.0"
},
"devDependencies": {
"@types/chalk": "^0.4.31",
"@types/fs-extra": "^3.0.3",
"@types/jest": "^20.0.2",
"@types/fs-extra": "^4.0.0",
"@types/jest": "^20.0.5",
"@types/minimist": "^1.2.0",
"@types/node": "^8.0.10"
},
Expand Down

0 comments on commit df6ed6c

Please sign in to comment.