From 954811762953672f226dd4b785de3d7e0a216457 Mon Sep 17 00:00:00 2001
From: leekt216 <leekt216@gmail.com>
Date: Wed, 6 Jun 2018 16:56:06 +0900
Subject: [PATCH 1/4] fixed json-loader error

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

diff --git a/examples/upload-file-via-browser/package.json b/examples/upload-file-via-browser/package.json
index 29ad8252a..8728b12ef 100644
--- a/examples/upload-file-via-browser/package.json
+++ b/examples/upload-file-via-browser/package.json
@@ -18,7 +18,7 @@
     "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',

From 96a50fb67382da5debb31c7e9a8fa17d25a3fab1 Mon Sep 17 00:00:00 2001
From: leekt216 <leekt216@gmail.com>
Date: Wed, 6 Jun 2018 17:12:46 +0900
Subject: [PATCH 2/4] add DS_Store

---
 .DS_Store          | Bin 0 -> 6148 bytes
 examples/.DS_Store | Bin 0 -> 6148 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 examples/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..34c19f72621762b66da6b77134538776a4fc41fc
GIT binary patch
literal 6148
zcmeHKJ8r`;3?*9+2D*66s4Mgag5jQ^7f8~ilM5Fx3Uu_8bLD7#{0t4;Z0Qm_0@RZz
zJ_&k*X^M#UUx#OrPDEO`p`2`3o9&yg>>(oxgyW1)8RaPR`(b`tW&a&8ZVS%0?BwG&
ze?Lv5ZPKU!6`%rCfC^B7n<|jywSBtjsXUAdP=R|;z`hR!ZdenSK>u`L@D>2rAnb;@
z_Y%Nj0bosB0ug~}P=P_!Y%w(Gh?mT(iA!M6MYH+PyjinDQNJDM7f%<hfgGs-6}VL3
zF_xXx{}=d`{{NE16&0WYccp+f!|TxFNm*N0kF#1^;9I!moZ)7eI|YN6W1yE~EUX-F
dJSp;u&9Pq-mq4c@?sOo3222+k75HxjegKCC6_x-1

literal 0
HcmV?d00001

diff --git a/examples/.DS_Store b/examples/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..8355697213262730737e1b50cdb280205ede780f
GIT binary patch
literal 6148
zcmeHKyH3ME5S)V)k!V5%<^4bk{=kaD7w`ilm`IT#j1nb?&K<wa>?2VkLrZ~XrM<b^
z+qtu+@OlB1*}i=MCIH5CLwwmVG}|{H*i}Xhi=VN<E2dati*AtpbHKQ_WbE;V7U%pA
z?0DK1Ypn3OYIiTouG`olcT9d~YKH|WQ*N)5c;IYtdVoCONaYjCq<|EV0#ZN<NCB(a
zX5*VcjZ#1gNP&|A_I;>y!zQs0^iKx|ZvluShTS;#UV>OHKx`8GKt^aKsKlU_Y%xmE
z8LyewB=&(pNAa6^PTpLyLn(ec<JHqqnm~<GKnh$ca2?Bu)&EEOFa7@|Nh>KJ1^$%+
zWi)@9&-hANTL&*^wYJiq=|^L(r*rU9O!QLBg_Yv_v%G3^?l*~jpwk(5I#E9Yri)Ap
H{DlJFGL|E@

literal 0
HcmV?d00001


From 94f88e10bcc392f4a1392e38b51e136bccc999c4 Mon Sep 17 00:00:00 2001
From: leekt216 <leekt216@gmail.com>
Date: Wed, 6 Jun 2018 18:36:13 +0900
Subject: [PATCH 3/4] removed DS_Store

---
 .DS_Store          | Bin 6148 -> 0 bytes
 examples/.DS_Store | Bin 6148 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 examples/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 34c19f72621762b66da6b77134538776a4fc41fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKJ8r`;3?*9+2D*66s4Mgag5jQ^7f8~ilM5Fx3Uu_8bLD7#{0t4;Z0Qm_0@RZz
zJ_&k*X^M#UUx#OrPDEO`p`2`3o9&yg>>(oxgyW1)8RaPR`(b`tW&a&8ZVS%0?BwG&
ze?Lv5ZPKU!6`%rCfC^B7n<|jywSBtjsXUAdP=R|;z`hR!ZdenSK>u`L@D>2rAnb;@
z_Y%Nj0bosB0ug~}P=P_!Y%w(Gh?mT(iA!M6MYH+PyjinDQNJDM7f%<hfgGs-6}VL3
zF_xXx{}=d`{{NE16&0WYccp+f!|TxFNm*N0kF#1^;9I!moZ)7eI|YN6W1yE~EUX-F
dJSp;u&9Pq-mq4c@?sOo3222+k75HxjegKCC6_x-1

diff --git a/examples/.DS_Store b/examples/.DS_Store
deleted file mode 100644
index 8355697213262730737e1b50cdb280205ede780f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKyH3ME5S)V)k!V5%<^4bk{=kaD7w`ilm`IT#j1nb?&K<wa>?2VkLrZ~XrM<b^
z+qtu+@OlB1*}i=MCIH5CLwwmVG}|{H*i}Xhi=VN<E2dati*AtpbHKQ_WbE;V7U%pA
z?0DK1Ypn3OYIiTouG`olcT9d~YKH|WQ*N)5c;IYtdVoCONaYjCq<|EV0#ZN<NCB(a
zX5*VcjZ#1gNP&|A_I;>y!zQs0^iKx|ZvluShTS;#UV>OHKx`8GKt^aKsKlU_Y%xmE
z8LyewB=&(pNAa6^PTpLyLn(ec<JHqqnm~<GKnh$ca2?Bu)&EEOFa7@|Nh>KJ1^$%+
zWi)@9&-hANTL&*^wYJiq=|^L(r*rU9O!QLBg_Yv_v%G3^?l*~jpwk(5I#E9Yri)Ap
H{DlJFGL|E@


From 57a7a47bae74a0f870a99218e62250f78e474161 Mon Sep 17 00:00:00 2001
From: leekt216 <leekt216@gmail.com>
Date: Wed, 6 Jun 2018 18:36:53 +0900
Subject: [PATCH 4/4] removed json-loader

---
 examples/upload-file-via-browser/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/upload-file-via-browser/package.json b/examples/upload-file-via-browser/package.json
index 8728b12ef..13a1235f1 100644
--- a/examples/upload-file-via-browser/package.json
+++ b/examples/upload-file-via-browser/package.json
@@ -14,7 +14,6 @@
     "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",