Skip to content

Commit 6cbe49c

Browse files
authored
Merge pull request #2 from bertho-zero/master
Merge pull from upstream
2 parents 3868460 + cd3579b commit 6cbe49c

4 files changed

Lines changed: 36 additions & 42 deletions

File tree

.babelrc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,7 @@
88
"transform-runtime",
99
"add-module-exports",
1010
"transform-decorators-legacy",
11-
[
12-
"flow-runtime",
13-
{
14-
"assert": true,
15-
"annotate": true
16-
}
17-
]
11+
"flow-runtime"
1812
],
1913
"env": {
2014
"development": {

.bootstraprc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"bootstrapVersion": 3,
3-
"bootstrapCustomizations": "./src/theme/variables.scss",
3+
"preBootstrapCustomizations": "./src/theme/variables.scss",
44
"appStyles": "./src/theme/bootstrap.overrides.scss",
55
"loglevel": "disabled",
66
"env": {

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ I cobbled this together from a wide variety of similar "starter" repositories. A
5151
<dd>Write composable, modular and maintenable CSS with your components.</dd>
5252

5353
<dt>Predictable state management</dt>
54-
<dd>Unidirectional data flow with Redux helps you write applications that behave consistently and are easy to test. On top of that, it provides a great developer experience.</dd>
54+
<dd>Unidirectional data flow with <a href="http://redux.js.org">Redux</a> helps you write applications that behave consistently and are easy to test. On top of that, it provides a great developer experience.</dd>
5555

5656
<dt>Backend API oriented services</dt>
57-
<dd>With Feathers it's easy to create scalable real-time applications with services and hooks.
57+
<dd>With <a href="http://feathersjs.com">Feathers</a> it's easy to create scalable real-time applications with services and hooks.
5858
<a href="https://en.wikipedia.org/wiki/Cross-cutting_concern">Cross cutting concerns</a> are an extremely powerful part of aspect oriented programming. They are a very good fit for web and mobile applications since the majority are primarily CRUD applications with lots of shared functionality. You can create before and after hooks and chain them together to create very complex processes while still maintaining modularity and flexibility.</dd>
5959

6060
<dt>Authentication</dt>
61-
<dd>Passport authentication allows you to use all the desired strategies. The connections in REST and in real time are protected in the same way with the hooks. React-router, redux and <a href="https://github.com/mjrussell/redux-auth-wrapper">redux-auth-wrapper</a> allow you to keep control in your React app.</dd>
61+
<dd><a href="http://passportjs.org">Passport</a> authentication allows you to use all the desired strategies. The connections in REST and in real time are protected in the same way with the hooks. React-router, redux and <a href="https://github.com/mjrussell/redux-auth-wrapper">redux-auth-wrapper</a> allow you to keep control in your React app.</dd>
6262

6363
<dt>Progressive wep app & Offline-first</dt>
6464
<dd>Progressive Web Apps are user experiences that have the reach of the web, and are:<br>
@@ -68,14 +68,14 @@ Engaging - Feel like a natural app on the device, with an immersive user experie
6868
This new level of quality allows Progressive Web Apps to earn a place on the user's home screen.</dd>
6969

7070
<dt>Lazy loading & dynamic routing</dt>
71-
<dd>The lazy loading makes the size of your main bundle almost fixed, and with react-router you can load application pieces on demand. You can send bundles to people who are only trained, such as administration.</dd>
71+
<dd>The code splitting makes the size of your main bundle almost fixed, and with react-router you can load application pieces on demand. You can send bundles to people who are only trained, such as administration.</dd>
7272

7373
<dt>Universal rendering</dt>
7474
<dd>With the help of server side rendering the first rendering is never empty and performance is better. This is the time for example to prefetch the data.
7575
<a href="https://github.com/halt-hammerzeit/webpack-isomorphic-tools">Webpack-isomorphic-tools</a> to allow require() work for statics both on client and server.</dd>
7676

7777
<dt>SEO</dt>
78-
<dd>This project supports SEO for search engines even whithout support indexing of JavaScript content, thanks to server-side rendering.</dd>
78+
<dd>This project supports SEO for search engines even without support indexing of JavaScript content, thanks to server-side rendering.</dd>
7979
</dl>
8080

8181
## Installation
@@ -282,4 +282,4 @@ Created by:
282282
– Erik Rasmussen, [@erikras](https://twitter.com/erikras)
283283
284284
Maintened by:
285-
Berthommier Kévin, [@bertho-zero](https://github.com/bertho-zero)
285+
– Kévin Berthommier, [@bertho-zero](https://github.com/bertho-zero)

package.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -99,25 +99,25 @@
9999
},
100100
"dependencies": {
101101
"async": "^2.1.4",
102-
"babel-core": "^6.22.1",
102+
"babel-core": "^6.23.1",
103103
"babel-plugin-add-module-exports": "^0.2.1",
104-
"babel-plugin-flow-runtime": "^0.2.1",
104+
"babel-plugin-flow-runtime": "^0.5.0",
105105
"babel-plugin-transform-decorators-legacy": "^1.3.4",
106-
"babel-plugin-transform-runtime": "^6.22.0",
107-
"babel-polyfill": "^6.22.0",
106+
"babel-plugin-transform-runtime": "^6.23.0",
107+
"babel-polyfill": "^6.23.0",
108108
"babel-preset-es2015": "^6.22.0",
109-
"babel-preset-react": "^6.22.0",
109+
"babel-preset-react": "^6.23.0",
110110
"babel-preset-stage-0": "^6.22.0",
111-
"babel-register": "^6.22.0",
112-
"babel-runtime": "^6.22.0",
113-
"body-parser": "^1.16.0",
111+
"babel-register": "^6.23.0",
112+
"babel-runtime": "^6.23.0",
113+
"body-parser": "^1.16.1",
114114
"compression": "^1.6.2",
115115
"cookie-parser": "^1.4.3",
116116
"express": "^4.14.1",
117-
"express-session": "^1.15.0",
117+
"express-session": "^1.15.1",
118118
"feathers": "^2.0.3",
119119
"feathers-authentication": "^1.0.2",
120-
"feathers-authentication-client": "^0.1.7",
120+
"feathers-authentication-client": "^0.1.8",
121121
"feathers-authentication-jwt": "^0.3.1",
122122
"feathers-authentication-local": "^0.3.3",
123123
"feathers-authentication-oauth1": "^0.2.3",
@@ -128,15 +128,15 @@
128128
"feathers-nedb": "^2.6.0",
129129
"feathers-rest": "^1.6.0",
130130
"feathers-socketio": "^1.4.2",
131-
"flow-runtime": "^0.2.1",
131+
"flow-runtime": "^0.5.0",
132132
"http-proxy": "^1.16.2",
133133
"is-promise": "^2.1.0",
134134
"js-cookie": "^2.1.3",
135135
"localforage": "^1.4.3",
136136
"localstorage-memory": "^1.0.2",
137137
"lodash.isplainobject": "^4.0.6",
138138
"lru-memoize": "^1.0.1",
139-
"morgan": "^1.7.0",
139+
"morgan": "^1.8.1",
140140
"multireducer": "^3.1.0",
141141
"nedb": "^1.8.0",
142142
"passport-facebook-token": "^3.3.0",
@@ -148,37 +148,37 @@
148148
"react-redux": "^5.0.2",
149149
"react-router": "^3.0.2",
150150
"react-router-bootstrap": "^0.23.1",
151-
"react-router-redux": "^4.0.7",
151+
"react-router-redux": "^4.0.8",
152152
"react-router-scroll": "^0.4.1",
153153
"redux": "^3.6.0",
154154
"redux-auth-wrapper": "^1.0.0",
155155
"redux-connect": "^5.0.0",
156156
"redux-form": "^6.5.0",
157-
"redux-persist": "^4.1.1",
157+
"redux-persist": "^4.4.0",
158158
"serialize-javascript": "^1.3.0",
159159
"serve-favicon": "^2.3.2",
160-
"socket.io": "^1.7.2",
161-
"socket.io-client": "^1.7.2",
162-
"superagent": "^3.4.1"
160+
"socket.io": "^1.7.3",
161+
"socket.io-client": "^1.7.3",
162+
"superagent": "^3.4.4"
163163
},
164164
"devDependencies": {
165165
"autoprefixer-loader": "^3.2.0",
166166
"babel-eslint": "^7.1.1",
167167
"babel-jest": "^18.0.0",
168-
"babel-loader": "^6.2.10",
168+
"babel-loader": "^6.3.2",
169169
"better-npm-run": "^0.0.14",
170-
"bootstrap-loader": "^2.0.0-beta.20",
170+
"bootstrap-loader": "2.0.0-beta.21",
171171
"bootstrap-sass": "^3.3.7",
172172
"chai": "^3.5.0",
173173
"clean-webpack-plugin": "^0.1.15",
174-
"concurrently": "^3.1.0",
174+
"concurrently": "^3.3.0",
175175
"css-loader": "^0.26.1",
176176
"eslint": "^3.15.0",
177-
"eslint-config-airbnb": "^14.0.0",
177+
"eslint-config-airbnb": "^14.1.0",
178178
"eslint-loader": "^1.6.1",
179179
"eslint-plugin-import": "^2.2.0",
180-
"eslint-plugin-jsx-a11y": "^3.0.2",
181-
"eslint-plugin-react": "^6.9.0",
180+
"eslint-plugin-jsx-a11y": "^4.0.0",
181+
"eslint-plugin-react": "^6.10.0",
182182
"extract-text-webpack-plugin": "2.0.0-beta.5",
183183
"file-loader": "^0.10.0",
184184
"font-awesome": "^4.7.0",
@@ -195,7 +195,7 @@
195195
"karma-webpack": "^2.0.2",
196196
"less": "^2.7.2",
197197
"less-loader": "^2.2.3",
198-
"lighthouse": "^1.4.1",
198+
"lighthouse": "^1.5.1",
199199
"mocha": "^3.2.0",
200200
"node-sass": "^4.5.0",
201201
"phantomjs-polyfill": "^0.0.2",
@@ -208,17 +208,17 @@
208208
"redux-devtools": "^3.3.2",
209209
"redux-devtools-dock-monitor": "^1.1.1",
210210
"redux-devtools-log-monitor": "^1.2.0",
211-
"resolve-url-loader": "^1.6.1",
212-
"sass-loader": "^4.1.1",
211+
"resolve-url-loader": "^2.0.0",
212+
"sass-loader": "^6.0.1",
213213
"sinon": "^1.17.7",
214214
"strip-loader": "^0.1.2",
215215
"style-loader": "^0.13.1",
216-
"sw-precache-webpack-plugin": "^0.8.0",
216+
"sw-precache-webpack-plugin": "^0.9.0",
217217
"timekeeper": "^1.0.0",
218218
"url-loader": "^0.5.7",
219219
"webpack": "^2.2.1",
220220
"webpack-dev-middleware": "^1.10.0",
221-
"webpack-hot-middleware": "^2.16.1",
221+
"webpack-hot-middleware": "^2.17.0",
222222
"webpack-isomorphic-tools": "^2.6.6"
223223
},
224224
"engines": {

0 commit comments

Comments
 (0)