From 5e7b7c4d379cd39c6ff6ba2685f1392c28355cd8 Mon Sep 17 00:00:00 2001
From: leekt216 <leekt216@gmail.com>
Date: Wed, 6 Jun 2018 18:40:47 +0900
Subject: [PATCH] fix: json-loader error in upload-file-via-browser example
 (#784)

* fixed json-loader error

* add DS_Store

* removed DS_Store

* removed json-loader
---
 examples/upload-file-via-browser/package.json      | 3 +--
 examples/upload-file-via-browser/webpack.config.js | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/examples/upload-file-via-browser/package.json b/examples/upload-file-via-browser/package.json
index 29ad8252a..13a1235f1 100644
--- a/examples/upload-file-via-browser/package.json
+++ b/examples/upload-file-via-browser/package.json
@@ -14,11 +14,10 @@
     "babel-core": "^5.4.7",
     "babel-loader": "^5.1.2",
     "ipfs-api": "../../",
-    "json-loader": "~0.5.4",
     "react": "^15.4.2",
     "react-dom": "^15.4.2",
     "react-hot-loader": "^1.3.1",
-    "webpack": "^1.9.6",
+    "webpack": "^2.0.0",
     "webpack-dev-server": "^1.8.2"
   }
 }
diff --git a/examples/upload-file-via-browser/webpack.config.js b/examples/upload-file-via-browser/webpack.config.js
index cbb60be2b..b4ccf9e88 100644
--- a/examples/upload-file-via-browser/webpack.config.js
+++ b/examples/upload-file-via-browser/webpack.config.js
@@ -21,9 +21,9 @@ module.exports = {
   module: {
     loaders: [{
       test: /\.js$/,
-      loaders: ['react-hot', 'babel'],
+      loaders: ['react-hot-loader', 'babel-loader'],
       include: path.join(__dirname, 'src')
-    }, { test: /\.json$/, loader: 'json-loader' }]
+    }]
   },
   node: {
     fs: 'empty',