Skip to content

Commit 326c47a

Browse files
committed
Updated eslint-config-shakacode to 13.2.0
Big change is that trailing commas are NO LONGER the default. Autofixer makes this easy! Be sure to run npm run lint -- --fix and you will be updated!
1 parent 51188ce commit 326c47a

15 files changed

+26
-27
lines changed

client/app/bundles/comments/components/CommentBox/CommentList/Comment/Comment.spec.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const {
1111
describe('Comment', () => {
1212
it('renders an author and comment with proper css classes', () => {
1313
const component = renderIntoDocument(
14-
<Comment author="Frank" text="Hi!" />
14+
<Comment author="Frank" text="Hi!" />,
1515
);
1616

1717
// TODO: Setup testing of CSS Modules classNames
@@ -25,7 +25,7 @@ describe('Comment', () => {
2525

2626
it('shows the author', () => {
2727
const component = renderIntoDocument(
28-
<Comment author="Frank" text="Hi!" />
28+
<Comment author="Frank" text="Hi!" />,
2929
);
3030

3131
const author = findRenderedDOMComponentWithClass(component, 'js-comment-author');
@@ -34,7 +34,7 @@ describe('Comment', () => {
3434

3535
it('shows the comment text in markdown', () => {
3636
const component = renderIntoDocument(
37-
<Comment author="Frank" text="Hi!" />
37+
<Comment author="Frank" text="Hi!" />,
3838
);
3939

4040
const comment = findRenderedDOMComponentWithClass(component, 'js-comment-text');

client/app/bundles/comments/components/CommentBox/CommentList/CommentList.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default class CommentList extends BaseComponent {
4444
key={$$comment.get('id') || index}
4545
author={$$comment.get('author')}
4646
text={$$comment.get('text')}
47-
/>
47+
/>,
4848
);
4949

5050
return (

client/app/bundles/comments/components/CommentBox/CommentList/CommentList.spec.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ describe('CommentList', () => {
3636
<CommentList
3737
$$comments={comments}
3838
cssTransitionGroupClassNames={cssTransitionGroupClassNames}
39-
/>
39+
/>,
4040
);
4141
const list = scryRenderedComponentsWithType(component, Comment);
4242
expect(list.length).to.equal(2);
@@ -49,7 +49,7 @@ describe('CommentList', () => {
4949
<CommentList
5050
$$comments={comments} error="zomg"
5151
cssTransitionGroupClassNames={cssTransitionGroupClassNames}
52-
/>
52+
/>,
5353
);
5454

5555
const alert = findRenderedDOMComponentWithTag(component, 'strong');

client/app/bundles/comments/reducers/commentsReducer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default function commentsReducer($$state = $$initialState, action = null)
3737
state
3838
.updateIn(
3939
['$$comments'],
40-
$$comments => $$comments.unshift(Immutable.fromJS(comment))
40+
$$comments => $$comments.unshift(Immutable.fromJS(comment)),
4141
)
4242
.merge({
4343
submitCommentError: null,

client/app/bundles/comments/startup/ClientRouterApp.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default (_props, _railsContext) => {
1313
// Create an enhanced history that syncs navigation events with the store
1414
const history = syncHistoryWithStore(
1515
browserHistory,
16-
store
16+
store,
1717
);
1818

1919
return (

client/app/bundles/comments/startup/ClientRouterAppExpress.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const RouterAppExpress = (_props, _railsContext) => {
1818
// Create an enhanced history that syncs navigation events with the store
1919
const history = syncHistoryWithStore(
2020
browserHistory,
21-
store
21+
store,
2222
);
2323

2424
return (

client/app/bundles/comments/startup/serverRegistration.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ReactOnRails.register(
1414
RouterApp,
1515
NavigationBarApp,
1616
SimpleCommentScreen,
17-
}
17+
},
1818
);
1919

2020
ReactOnRails.registerStore({

client/app/bundles/comments/store/commentsStore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default (props, railsContext) => {
1515

1616
const reducer = combineReducers(reducers);
1717
const composedStore = compose(
18-
applyMiddleware(thunkMiddleware, loggerMiddleware)
18+
applyMiddleware(thunkMiddleware, loggerMiddleware),
1919
);
2020

2121
return composedStore(createStore)(reducer, initialState);

client/app/bundles/comments/store/routerCommentsStore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default (props, railsContext) => {
2424

2525
// Sync dispatched route actions to the history
2626
const finalCreateStore = compose(
27-
applyMiddleware(thunkMiddleware, loggerMiddleware)
27+
applyMiddleware(thunkMiddleware, loggerMiddleware),
2828
)(createStore);
2929

3030
return finalCreateStore(reducer, initialState);

client/app/libs/middlewares/loggerMiddleware.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export default function logger({ getState }) {
1515
readableState[storeItem] = (
1616
state[storeItem].toJS ? state[storeItem].toJS() : state[storeItem]
1717
);
18-
return;
1918
});
2019

2120
console.log('state after dispatch', readableState);

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
"chai": "^3.5.0",
9595
"chai-immutable": "^1.6.0",
9696
"eslint": "^3.10.2",
97-
"eslint-config-shakacode": "^13.1.0",
97+
"eslint-config-shakacode": "^13.2.0-beta.1",
9898
"eslint-import-resolver-webpack": "^0.7.0",
9999
"eslint-plugin-import": "^2.2.0",
100100
"eslint-plugin-jsx-a11y": "^2.2.3",

client/server-rails-hot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ const devServer = new WebpackDevServer(compiler, {
3030
devServer.listen(hotRailsPort, 'localhost', (err) => {
3131
if (err) console.error(err);
3232
console.log(
33-
`=> 🔥 Webpack development server is running on port ${hotRailsPort}`
33+
`=> 🔥 Webpack development server is running on port ${hotRailsPort}`,
3434
);
3535
});

client/webpack.client.express.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ config.entry.app.push(
1616

1717
// Webpack dev server
1818
`webpack-dev-server/client?http://localhost:${hotPort}`,
19-
'webpack/hot/dev-server'
19+
'webpack/hot/dev-server',
2020
);
2121

2222
config.output = {
@@ -27,7 +27,7 @@ config.output = {
2727
};
2828
config.plugins.unshift(
2929
new webpack.HotModuleReplacementPlugin(),
30-
new webpack.NoErrorsPlugin()
30+
new webpack.NoErrorsPlugin(),
3131
);
3232
config.devtool = 'eval-source-map';
3333

@@ -71,7 +71,7 @@ config.module.loaders.push(
7171
'sass',
7272
'sass-resources',
7373
],
74-
}
74+
},
7575
);
7676

7777
module.exports = config;

client/webpack.client.rails.build.config.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ config.entry.vendor.unshift(
2121
'jquery-ujs',
2222

2323
// Configures extractStyles to be true if NODE_ENV is production
24-
'bootstrap-loader/extractStyles'
24+
'bootstrap-loader/extractStyles',
2525
);
2626

2727
// See webpack.common.config for adding modules common to both the webpack dev server and rails
@@ -37,7 +37,7 @@ config.module.loaders.push(
3737
loader: ExtractTextPlugin.extract(
3838
'style',
3939
'css?minimize&modules&importLoaders=1&localIdentName=[name]__[local]__[hash:base64:5]' +
40-
'!postcss'
40+
'!postcss',
4141
),
4242
},
4343
{
@@ -47,7 +47,7 @@ config.module.loaders.push(
4747
'css?minimize&modules&importLoaders=3&localIdentName=[name]__[local]__[hash:base64:5]' +
4848
'!postcss' +
4949
'!sass' +
50-
'!sass-resources'
50+
'!sass-resources',
5151
),
5252
},
5353
{
@@ -57,12 +57,12 @@ config.module.loaders.push(
5757
{
5858
test: require.resolve('jquery-ujs'),
5959
loader: 'imports?jQuery=jquery',
60-
}
60+
},
6161
);
6262

6363
config.plugins.push(
6464
new ExtractTextPlugin('[name]-bundle.css', { allChunks: true }),
65-
new webpack.optimize.DedupePlugin()
65+
new webpack.optimize.DedupePlugin(),
6666
);
6767

6868
if (devBuild) {

client/webpack.client.rails.hot.config.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ const hotRailsPort = process.env.HOT_RAILS_PORT || 3500;
1212

1313
config.entry.app.push(
1414
`webpack-dev-server/client?http://localhost:${hotRailsPort}`,
15-
'webpack/hot/only-dev-server'
15+
'webpack/hot/only-dev-server',
1616
);
1717

1818
// These are Rails specific
1919
config.entry.vendor.push(
2020
'jquery-ujs',
21-
'bootstrap-loader'
21+
'bootstrap-loader',
2222
);
2323

2424
config.output = {
@@ -71,12 +71,12 @@ config.module.loaders.push(
7171
{
7272
test: require.resolve('jquery-ujs'),
7373
loader: 'imports?jQuery=jquery',
74-
}
74+
},
7575
);
7676

7777
config.plugins.push(
7878
new webpack.HotModuleReplacementPlugin(),
79-
new webpack.NoErrorsPlugin()
79+
new webpack.NoErrorsPlugin(),
8080
);
8181

8282
config.devtool = 'eval-source-map';

0 commit comments

Comments
 (0)