forked from GordyD/3ree
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Version bump of dependencies plus setting engine expectation of node …
…to 6.0.0 (GordyD#44) * Version bump of dependencies plus setting engine expectation of node to 6.0.0 - Usage of `react-router` and `react-router-redux` has been updated - Usage of `redux-mock-store` has also been updated following breaking changes that were present in tests - Use x denotation to in package dependencies to denote acceptability of dependencies minor version updates * Remove local specific settings from default.json * Tell CircleCI to use Node v.6.0.0 and use global doc to stop eslint error on ES6 Promise usage in dbSetup.js * Update Readme.md to include new version numbers and some guidance around Node and RethinkdDb versions
- Loading branch information
Showing
11 changed files
with
121 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,9 +26,10 @@ There is a demo app hosted at [3ree-demo.workshape.io](http://3ree-demo.workshap | |
|
||
### Setup | ||
|
||
You will need to install [RethinkDB](http://www.rethinkdb.com). You can find instruction on how to do so [here](http://rethinkdb.com/docs/install/). | ||
You will need to install [RethinkDB](http://www.rethinkdb.com). You can find instruction on how to do so [here](http://rethinkdb.com/docs/install/). Make sure you have the latest version installed. | ||
|
||
- Clone the repo `git clone [email protected]:GordyD/3ree.git` | ||
- Make sure you are using Node v6.0.0 (I recommend using [n](https://github.com/tj/n) for Node version management) | ||
- Run `npm install` | ||
- If your local environment is not reflected by `config/default.json`, then add a file at `config/local.json` to provide local customisation. | ||
- Run `npm run db-setup` to set up DB | ||
|
@@ -53,15 +54,15 @@ You will need to roll out your own deployment script for a server, but before yo | |
|
||
| **Tech** | **Description** | **Version** | | ||
| ---------|-----------------|-------------| | ||
| [React](https://facebook.github.io/react/) | View layer | 0.14.7 | | ||
| [React Router](https://github.com/reactjs/react-router) | Universal routing | 2.0.0 | | ||
| [Redux](http://redux.js.org/) | State management | 3.1.0 | | ||
| [RethinkDB](http://www.rethinkdb.com) | Persistance layer | 2.2.4 | | ||
| [Express](http://expressjs.com/) | Node.js server framework | 4.13.3 | | ||
| [Socket.io]() | Used for realtime communication between clients and server | 1.4.4 | | ||
| [Webpack](https://webpack.github.io/) | Module bundling + build for client | 1.12.11 | | ||
| [Superagent](https://github.com/visionmedia/superagent) | Universal http requests | 1.6.1 | | ||
| [Stylus](http://stylus-lang.com/) | Expressive, dynamic, robust CSS | 0.53.0 | | ||
| [React](https://facebook.github.io/react/) | View layer | 15.0.2 | | ||
| [React Router](https://github.com/reactjs/react-router) | Universal routing | 2.4.0 | | ||
| [Redux](http://redux.js.org/) | State management | 3.5.0 | | ||
| [RethinkDB](http://www.rethinkdb.com) | Persistance layer | 2.3.1 | | ||
| [Express](http://expressjs.com/) | Node.js server framework | 4.13.0 | | ||
| [Socket.io]() | Used for realtime communication between clients and server | 1.4.0 | | ||
| [Webpack](https://webpack.github.io/) | Module bundling + build for client | 1.13.0 | | ||
| [Superagent](https://github.com/visionmedia/superagent) | Universal http requests | 1.8.0 | | ||
| [Stylus](http://stylus-lang.com/) | Expressive, dynamic, robust CSS | 0.54.0 | | ||
|
||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,6 @@ | ||
machine: | ||
node: | ||
version: 6.0.0 | ||
test: | ||
override: | ||
- npm run lint | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
/* global Promise */ | ||
import r from 'rethinkdb'; | ||
import config from 'config'; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.