Skip to content

Commit

Permalink
Add webpack json-loader
Browse files Browse the repository at this point in the history
  • Loading branch information
Brandon Tilley committed May 18, 2014
1 parent 319c3cd commit 74742db
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
3 changes: 2 additions & 1 deletion examples/carousel/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ module.exports = {
module: {
loaders: [
{ test: /\.less$/, loader: "style!css!less" },
{ test: /\.jsx$/, loader: "jsx-loader" }
{ test: /\.jsx$/, loader: "jsx-loader" },
{ test: /\.json$/, loader: "json" }
]
}
};
3 changes: 2 additions & 1 deletion examples/todo-basic/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ module.exports = {
module: {
loaders: [
{ test: /\.less$/, loader: "style!css!less" },
{ test: /\.jsx$/, loader: "jsx-loader" }
{ test: /\.jsx$/, loader: "jsx-loader" },
{ test: /\.json$/, loader: "json" }
]
}
};
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"css-loader": "^0.6.12",
"envify": "^1.2.1",
"jsdom": "^0.10.5",
"json-loader": "^0.5.0",
"jsx-loader": "^0.10.2",
"jsxhint": "^0.4.9",
"less": "^1.7.0",
Expand Down
3 changes: 2 additions & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ module.exports = {
module: {
loaders: [
{ test: /\.less$/, loader: "style!css!less" },
{ test: /\.jsx$/, loader: "jsx-loader" }
{ test: /\.jsx$/, loader: "jsx-loader" },
{ test: /\.json$/, loader: "json" }
]
}
};

0 comments on commit 74742db

Please sign in to comment.