Skip to content

Commit 2f8cf33

Browse files
committed
Merge pull request #195 from shakacode/update-dependencies
Update dependencies and fix couple lint issues
2 parents 882acba + 6c962f0 commit 2f8cf33

File tree

4 files changed

+25
-16
lines changed

4 files changed

+25
-16
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ export default class CommentBox extends BaseComponent {
3737
Comments {data.get('isFetching') && 'Loading...'}
3838
</h2>
3939
<p>
40-
<b>Text</b> supports Github Flavored Markdown. Comments older than 24 hours are deleted.<br/>
40+
<b>Text</b> supports Github Flavored Markdown.
41+
Comments older than 24 hours are deleted.<br/>
4142
<b>Name</b> is preserved. <b>Text</b> is reset, between submits.
4243
</p>
4344
<CommentForm

client/npm-shrinkwrap.json

+17-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"css-loader": "^0.23.0",
5353
"es5-shim": "^4.3.1",
5454
"expose-loader": "^0.7.1",
55-
"extract-text-webpack-plugin": "^0.9.1",
55+
"extract-text-webpack-plugin": "^1.0.1",
5656
"file-loader": "^0.8.4",
5757
"history": "^1.13.1",
5858
"immutable": "^3.7.5",
@@ -88,7 +88,7 @@
8888
"chai": "^3.4.1",
8989
"chai-immutable": "^1.5.3",
9090
"eslint": "^1.10.3",
91-
"eslint-config-airbnb": "^2.0.0",
91+
"eslint-config-airbnb": "^3.0.2",
9292
"eslint-plugin-react": "^3.11.3",
9393
"express": "^4.13.3",
9494
"jade": "^1.11.0",

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ config.module.loaders.push(
4646
'!sass-resources'
4747
),
4848
},
49-
{ test: require.resolve('react'), loader: 'imports?shim=es5-shim/es5-shim&sham=es5-shim/es5-sham' }
49+
{
50+
test: require.resolve('react'),
51+
loader: 'imports?shim=es5-shim/es5-shim&sham=es5-shim/es5-sham',
52+
}
5053
);
5154

5255
config.plugins.push(

0 commit comments

Comments
 (0)