Skip to content
This repository was archived by the owner on Sep 6, 2022. It is now read-only.

Commit 67d671b

Browse files
authored
chore(deps): update deps roll-up Sep-04-2016 (#956)
* fix(#950) WIP several steps toward solution - not there yet See react-boilerplate/react-boilerplate#950 * chore(webpack): fallbackloader -> fallbackLoader * chore(deps): update deps roll-up Sep-04-2016 * chore(deps): update react-router-scroll@0.2.1 -> 0.3.2 Requires changes to: - app/app.js - internals/templates/app.js * chore(deps): update stylelint-config-standard 12.0.0 → 13.0.0 Requires changes to: - app/components/Button/styles.css - app/components/Button/styles.css - stylelint section in package.json
1 parent d69f548 commit 67d671b

File tree

5 files changed

+21
-16
lines changed

5 files changed

+21
-16
lines changed

app/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { Provider } from 'react-redux';
2222
import { applyRouterMiddleware, Router, browserHistory } from 'react-router';
2323
import { syncHistoryWithStore } from 'react-router-redux';
2424
import FontFaceObserver from 'fontfaceobserver';
25-
import useScroll from 'react-router-scroll';
25+
import { useScroll } from 'react-router-scroll';
2626
import configureStore from './store';
2727

2828
// Import Language Provider

app/components/Button/styles.css

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
box-sizing: border-box;
1010
padding: 0.25em 2em;
1111
margin: 0;
12-
border: 0;
1312
text-decoration: none;
1413
border-radius: 4px;
1514
-webkit-font-smoothing: antialiased;
@@ -20,7 +19,6 @@
2019
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
2120
font-weight: bold;
2221
font-size: 16px;
23-
color: #FFF;
2422
border: 2px solid #41ADDD;
2523
color: #41ADDD;
2624
}

app/components/List/styles.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
.list {
1313
list-style: none;
14-
padding: 0;
1514
margin: 0;
1615
width: 100%;
1716
max-height: 30em;

internals/templates/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import ReactDOM from 'react-dom';
1818
import { Provider } from 'react-redux';
1919
import { applyRouterMiddleware, Router, browserHistory } from 'react-router';
2020
import { syncHistoryWithStore } from 'react-router-redux';
21-
import useScroll from 'react-router-scroll';
21+
import { useScroll } from 'react-router-scroll';
2222
import LanguageProvider from 'containers/LanguageProvider';
2323
import configureStore from './store';
2424

package.json

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,14 @@
164164
]
165165
}
166166
],
167+
"property-no-unknown": [
168+
true,
169+
{
170+
"ignoreProperties": [
171+
"composes"
172+
]
173+
}
174+
],
167175
"indentation": 2
168176
}
169177
},
@@ -190,7 +198,7 @@
190198
"cross-env": "2.0.0",
191199
"compression": "1.6.2",
192200
"express": "4.14.0",
193-
"fontfaceobserver": "2.0.1",
201+
"fontfaceobserver": "2.0.4",
194202
"immutable": "3.8.1",
195203
"intl": "1.2.4",
196204
"invariant": "2.2.1",
@@ -201,11 +209,11 @@
201209
"react-dom": "15.3.1",
202210
"react-helmet": "3.1.0",
203211
"react-redux": "4.4.5",
204-
"react-intl": "2.1.4",
212+
"react-intl": "2.1.5",
205213
"react-router": "2.7.0",
206214
"react-router-redux": "4.0.5",
207-
"react-router-scroll": "0.2.1",
208-
"redux": "3.5.2",
215+
"react-router-scroll": "0.3.2",
216+
"redux": "3.6.0",
209217
"redux-immutable": "3.0.8",
210218
"redux-saga": "0.11.1",
211219
"reselect": "2.5.3",
@@ -218,8 +226,8 @@
218226
"babel-core": "6.14.0",
219227
"babel-eslint": "6.1.2",
220228
"babel-loader": "6.2.5",
221-
"babel-plugin-istanbul": "2.0.0",
222-
"babel-plugin-react-intl": "2.1.4",
229+
"babel-plugin-istanbul": "2.0.1",
230+
"babel-plugin-react-intl": "2.2.0",
223231
"babel-plugin-react-transform": "2.0.2",
224232
"babel-plugin-transform-react-constant-elements": "6.9.1",
225233
"babel-plugin-transform-react-inline-elements": "6.8.0",
@@ -238,8 +246,8 @@
238246
"eslint-config-airbnb": "10.0.1",
239247
"eslint-import-resolver-webpack": "0.5.1",
240248
"eslint-plugin-import": "1.14.0",
241-
"eslint-plugin-jsx-a11y": "2.2.0",
242-
"eslint-plugin-react": "6.1.2",
249+
"eslint-plugin-jsx-a11y": "2.2.1",
250+
"eslint-plugin-react": "6.2.0",
243251
"eventsource-polyfill": "0.9.6",
244252
"expect": "1.20.2",
245253
"expect-jsx": "2.6.0",
@@ -269,16 +277,16 @@
269277
"plop": "1.5.0",
270278
"postcss-cssnext": "2.7.0",
271279
"postcss-focus": "1.0.0",
272-
"postcss-loader": "0.11.0",
280+
"postcss-loader": "0.11.1",
273281
"postcss-reporter": "1.4.1",
274282
"pre-commit": "1.1.3",
275283
"psi": "2.0.4",
276284
"rimraf": "2.5.4",
277285
"shelljs": "0.7.4",
278286
"sinon": "2.0.0-pre",
279287
"style-loader": "0.13.1",
280-
"stylelint": "7.1.0",
281-
"stylelint-config-standard": "12.0.0",
288+
"stylelint": "7.2.0",
289+
"stylelint-config-standard": "13.0.0",
282290
"url-loader": "0.5.7",
283291
"webpack": "2.1.0-beta.21",
284292
"webpack-dev-middleware": "1.6.1",

0 commit comments

Comments
 (0)