From 4ca318fe4d27f557abc00af2d835d2e73da596a8 Mon Sep 17 00:00:00 2001 From: Dafeng Guo Date: Fri, 22 Sep 2017 15:06:24 +0800 Subject: [PATCH 1/6] docs: fix js dependencies in webpack example --- examples/browser-webpack/package.json | 6 +++++- examples/browser-webpack/src/components/app.js | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/examples/browser-webpack/package.json b/examples/browser-webpack/package.json index 3d9971a01a..518d9f1993 100644 --- 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 index ba6264ef71..45e5501a6d 100644 --- 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' From 8d57dfe741f17097c201090cb5a8e44dc8410b9e Mon Sep 17 00:00:00 2001 From: David Dias Date: Sun, 22 Oct 2017 19:02:00 +0100 Subject: [PATCH 2/6] Update app.js --- examples/browser-webpack/src/components/app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/browser-webpack/src/components/app.js b/examples/browser-webpack/src/components/app.js index 45e5501a6d..67d3a3349a 100644 --- a/examples/browser-webpack/src/components/app.js +++ b/examples/browser-webpack/src/components/app.js @@ -2,7 +2,6 @@ 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 stringToUse = 'hello world from webpacked IPFS' From 51f0ca035e0f707cff82a8f914426560dfbc60be Mon Sep 17 00:00:00 2001 From: David Dias Date: Sun, 22 Oct 2017 19:02:28 +0100 Subject: [PATCH 3/6] Update package.json --- examples/browser-webpack/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/browser-webpack/package.json b/examples/browser-webpack/package.json index 518d9f1993..51d67d02cf 100644 --- a/examples/browser-webpack/package.json +++ b/examples/browser-webpack/package.json @@ -18,7 +18,7 @@ "webpack-dev-server": "^2.4.5" }, "dependencies": { - "ipfs": "^0.26.0", + "ipfs": "file:../../", "ipfs-block-service": "^0.12.0", "react": "^15.6.1", "react-dom": "^15.6.1", From cfb8038258e3107d32a5ed0284c2063156a53351 Mon Sep 17 00:00:00 2001 From: David Dias Date: Sun, 22 Oct 2017 19:02:52 +0100 Subject: [PATCH 4/6] Update package.json --- examples/browser-webpack/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/browser-webpack/package.json b/examples/browser-webpack/package.json index 51d67d02cf..21537ee23d 100644 --- a/examples/browser-webpack/package.json +++ b/examples/browser-webpack/package.json @@ -19,7 +19,6 @@ }, "dependencies": { "ipfs": "file:../../", - "ipfs-block-service": "^0.12.0", "react": "^15.6.1", "react-dom": "^15.6.1", "safe-buffer": "^5.0.1" From 7783675a1d423887c3b585dfd9a1bc94e08d1d06 Mon Sep 17 00:00:00 2001 From: David Dias Date: Sun, 22 Oct 2017 19:03:03 +0100 Subject: [PATCH 5/6] Update package.json --- examples/browser-webpack/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/browser-webpack/package.json b/examples/browser-webpack/package.json index 21537ee23d..0675e17f5c 100644 --- a/examples/browser-webpack/package.json +++ b/examples/browser-webpack/package.json @@ -20,7 +20,6 @@ "dependencies": { "ipfs": "file:../../", "react": "^15.6.1", - "react-dom": "^15.6.1", - "safe-buffer": "^5.0.1" + "react-dom": "^15.6.1" } } From f97fb52cc1a3f476374ba77d3203acae9c66c3ed Mon Sep 17 00:00:00 2001 From: David Dias Date: Sun, 22 Oct 2017 19:03:30 +0100 Subject: [PATCH 6/6] Update app.js --- examples/browser-webpack/src/components/app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/browser-webpack/src/components/app.js b/examples/browser-webpack/src/components/app.js index 67d3a3349a..7e6b273643 100644 --- a/examples/browser-webpack/src/components/app.js +++ b/examples/browser-webpack/src/components/app.js @@ -1,7 +1,6 @@ 'use strict' const React = require('react') -const Buffer = require('safe-buffer').Buffer const IPFS = require('ipfs') const stringToUse = 'hello world from webpacked IPFS'