Merge 4ca318f into 18755d4

ipfs · Sep 22, 2017 · 48b9462 · 48b9462
2 parents 18755d4 + 4ca318f
commit 48b9462
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/examples/browser-webpack/package.json b/examples/browser-webpack/package.json
@@ -11,13 +11,17 @@
     "babel-core": "^6.24.1",
     "babel-loader": "^7.0.0",
     "babel-preset-react": "^6.24.1",
+    "babel-preset-stage-0": "^6.24.1",
     "json-loader": "^0.5.4",
-    "react": "^15.5.4",
     "react-hot-loader": "^1.3.1",
     "webpack": "^2.5.1",
     "webpack-dev-server": "^2.4.5"
   },
   "dependencies": {
+    "ipfs": "^0.26.0",
+    "ipfs-block-service": "^0.12.0",
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1",
     "safe-buffer": "^5.0.1"
   }
 }
diff --git a/examples/browser-webpack/src/components/app.js b/examples/browser-webpack/src/components/app.js
@@ -2,8 +2,8 @@
 
 const React = require('react')
 const Buffer = require('safe-buffer').Buffer
-const IPFS = require('../../../../src/core') // replace this by line below
-// const IPFS = require('ipfs')
+// const IPFS = require('../../../../src/core') // replace this by line below
+const IPFS = require('ipfs')
 
 const stringToUse = 'hello world from webpacked IPFS'