From 74742dbf3e2b7c52eb8c0b95c3108eb1a859ac59 Mon Sep 17 00:00:00 2001
From: Brandon Tilley <brandon@brandontilley.com>
Date: Sun, 18 May 2014 14:59:06 -0700
Subject: [PATCH] Add webpack json-loader

---
 examples/carousel/webpack.config.js   | 3 ++-
 examples/todo-basic/webpack.config.js | 3 ++-
 package.json                          | 1 +
 webpack.config.js                     | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/examples/carousel/webpack.config.js b/examples/carousel/webpack.config.js
index fe4f8a8..10735cd 100644
--- a/examples/carousel/webpack.config.js
+++ b/examples/carousel/webpack.config.js
@@ -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" }
     ]
   }
 };
diff --git a/examples/todo-basic/webpack.config.js b/examples/todo-basic/webpack.config.js
index fe4f8a8..10735cd 100644
--- a/examples/todo-basic/webpack.config.js
+++ b/examples/todo-basic/webpack.config.js
@@ -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" }
     ]
   }
 };
diff --git a/package.json b/package.json
index 8615ae8..822ea64 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/webpack.config.js b/webpack.config.js
index e51c0af..2e327f0 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -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" }
     ]
   }
 };