Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Init ipfs-api or js-ipfs #320

Merged
merged 20 commits into from
Dec 12, 2017
Merged

Init ipfs-api or js-ipfs #320

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e030a36
Factor out creation of ipfs node
olizilla Nov 28, 2017
7913c2e
Pass opts through to ipfs clients
olizilla Nov 28, 2017
4f2eba9
Use global Buffer and ipfs.files
olizilla Nov 28, 2017
2033c83
Remove notes
olizilla Nov 28, 2017
f603614
Fix destroy logic. Pin deps
olizilla Nov 29, 2017
b1c6dbe
Merge remote-tracking branch 'origin/master' into feat/ipfs-init
olizilla Nov 29, 2017
67f8003
Wire up toggle node type
olizilla Nov 29, 2017
c3ce095
Add stringProtocolHandler detect & ipfs:// handler
olizilla Nov 30, 2017
00f913e
Handle missing notifications api
olizilla Nov 30, 2017
e0e17d8
Fix stream error. Disable mimeType check
olizilla Nov 30, 2017
d3989ec
Add basic mime-sniff impl
olizilla Nov 30, 2017
f440bb3
Extract logo component and use on quick upload
olizilla Dec 1, 2017
ffc36f8
Merge branch 'remove-bg-page-api' into feat/ipfs-init
olizilla Dec 1, 2017
eda6abf
Add API to status section. Add element titles.
olizilla Dec 1, 2017
4c50055
Add ipfsNodeType option
olizilla Dec 1, 2017
8529944
Fix typo
olizilla Dec 4, 2017
7ff69af
Merge remote-tracking branch 'upstream/master' into feat/ipfs-init
olizilla Dec 11, 2017
5a4a4f8
Quick fix for automatic mode
olizilla Dec 11, 2017
84b2ada
Hide js-ipfs if not available.
olizilla Dec 12, 2017
a0c38aa
cosmetic fixes before merge
lidel Dec 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into feat/ipfs-init
  • Loading branch information
@olizilla
olizilla committed Nov 29, 2017
commit b1c6dbe57b4a5007208f605e1ed87dea6ee9f925
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
"build:copy": "run-s build:copy:*",
"build:copy:src": "shx mkdir -p add-on/dist && shx cp -R add-on/src/* add-on/dist",
"build:copy:wx-polyfill-lib": "shx cp node_modules/webextension-polyfill/dist/browser-polyfill.min.js add-on/dist/contentScripts/browser-polyfill.min.js",
"build:js": "browserify -p prundupify -t [ browserify-package-json --global ] add-on/src/background/background.js add-on/src/options/options.js add-on/src/popup/browser-action/index.js add-on/src/popup/quick-upload.js -p [ factor-bundle -o add-on/dist/background/background.js -o add-on/dist/options/options.js -o add-on/dist/popup/browser-action/browser-action.js -o add-on/dist/popup/quick-upload.js ] -o add-on/dist/ipfs-companion-common.js",
"build:js": "browserify -p prundupify -t browserify-css -t [ browserify-package-json --global ] add-on/src/background/background.js add-on/src/options/options.js add-on/src/popup/browser-action/index.js add-on/src/popup/quick-upload.js -p [ factor-bundle -o add-on/dist/background/background.js -o add-on/dist/options/options.js -o add-on/dist/popup/browser-action/browser-action.js -o add-on/dist/popup/quick-upload.js ] -o add-on/dist/ipfs-companion-common.js",
"build:minimize-dist": "shx rm -rf add-on/dist/lib",
"build:bundle-extension": "web-ext build -s add-on/ -i src/ -a build/",
"watch": "run-p watch:*",
"watch:js": "watchify -p prundupify -t [ browserify-package-json --global ] add-on/src/background/background.js add-on/src/options/options.js add-on/src/popup/browser-action/index.js add-on/src/popup/quick-upload.js -p [ factor-bundle -o add-on/dist/background/background.js -o add-on/dist/options/options.js -o add-on/dist/popup/browser-action/browser-action.js -o add-on/dist/popup/quick-upload.js ] -o add-on/dist/ipfs-companion-common.js -v",
"watch:js": "watchify -p prundupify -t browserify-css -t [ browserify-package-json --global ] add-on/src/background/background.js add-on/src/options/options.js add-on/src/popup/browser-action/index.js add-on/src/popup/quick-upload.js -p [ factor-bundle -o add-on/dist/background/background.js -o add-on/dist/options/options.js -o add-on/dist/popup/browser-action/browser-action.js -o add-on/dist/popup/quick-upload.js ] -o add-on/dist/ipfs-companion-common.js -v",
"test": "run-s test:*",
"test:functional": "mocha test/functional/**/*.test.js",
"lint": "run-s lint:*",
Expand Down Expand Up @@ -73,7 +73,8 @@
"ipfs-api": "17.1.3",
"is-ipfs": "0.3.2",
"lru_map": "0.3.3",
"prundupify": "^1.0.0",
"prundupify": "1.0.0",
"tachyons": "^4.9.0",
"webextension-polyfill": "0.1.2"
}
}
59 changes: 46 additions & 13 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3163,6 +3163,13 @@ finalhandler@1.0.6:
statuses "~1.3.1"
unpipe "~1.0.0"

find-node-modules@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/find-node-modules/-/find-node-modules-1.0.4.tgz#b6deb3cccb699c87037677bcede2c5f5862b2550"
dependencies:
findup-sync "0.4.2"
merge "^1.2.0"

find-process@^1.0.5:
version "1.1.0"
resolved "https://registry.yarnpkg.com/find-process/-/find-process-1.1.0.tgz#f21fa08220fec972b471d92ae3cf0c62bebcd5bb"
Expand Down Expand Up @@ -3287,6 +3294,10 @@ from@~0:
version "0.1.7"
resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"

fs-exists-sync@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"

"fs-ext@github:baudehlo/node-fs-ext#master":
version "1.0.0"
resolved "https://codeload.github.com/baudehlo/node-fs-ext/tar.gz/500be8514729c194ac7ca2b30b5bc7eaf812670d"
Expand Down Expand Up @@ -3514,6 +3525,22 @@ global-dirs@^0.1.0:
dependencies:
ini "^1.3.4"

global-modules@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
dependencies:
global-prefix "^0.1.4"
is-windows "^0.2.0"

global-prefix@^0.1.4:
version "0.1.5"
resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"
dependencies:
homedir-polyfill "^1.0.0"
ini "^1.3.4"
is-windows "^0.2.0"
which "^1.2.12"

globals@^9.14.0, globals@^9.17.0, globals@^9.18.0:
version "9.18.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
Expand Down Expand Up @@ -5115,7 +5142,7 @@ level-js@^2.2.4:
typedarray-to-buffer "~1.0.0"
xtend "~2.1.2"

level-js@timkuijsten/level.js#idbunwrapper:
"level-js@github:timkuijsten/level.js#idbunwrapper":
version "2.2.3"
resolved "https://codeload.github.com/timkuijsten/level.js/tar.gz/18e03adab34c49523be7d3d58fafb0c632f61303"
dependencies:
Expand Down Expand Up @@ -5713,6 +5740,10 @@ meow@^3.3.0:
redent "^1.0.0"
trim-newlines "^1.0.0"

merge@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"

merkle-patricia-tree@^2.1.2, merkle-patricia-tree@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/merkle-patricia-tree/-/merkle-patricia-tree-2.2.0.tgz#7a4787b1262ab00fe9b204ab471b005332306efa"
Expand All @@ -5726,7 +5757,7 @@ merkle-patricia-tree@^2.1.2, merkle-patricia-tree@^2.2.0:
rlp "^2.0.0"
semaphore ">=1.0.1"

micromatch@^2.1.5:
micromatch@^2.1.5, micromatch@^2.3.7:
version "2.3.11"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
dependencies:
Expand Down Expand Up @@ -5958,7 +5989,7 @@ multipart-stream@^2.0.1:
is-stream "^1.0.1"
sandwich-stream "^1.0.0"

multiplex@dignifiedquire/multiplex:
"multiplex@github:dignifiedquire/multiplex":
version "6.7.0"
resolved "https://codeload.github.com/dignifiedquire/multiplex/tar.gz/b5d5edd30454e2c978ee8c52df86f5f4840d2eab"
dependencies:
Expand Down Expand Up @@ -6835,7 +6866,7 @@ prr@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"

prundupify@^1.0.0:
prundupify@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/prundupify/-/prundupify-1.0.0.tgz#772874e2a6b355e8f7179313e71f9f0545ec98ee"
dependencies:
Expand Down Expand Up @@ -7946,6 +7977,15 @@ socket.io@^2.0.3:
socket.io-client "2.0.4"
socket.io-parser "~3.1.1"

source-map-resolve@^0.3.0:
version "0.3.1"
resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.3.1.tgz#610f6122a445b8dd51535a2a71b783dfc1248761"
dependencies:
atob "~1.1.0"
resolve-url "~0.2.1"
source-map-url "~0.3.0"
urix "~0.1.0"

source-map-support@0.4.6:
version "0.4.6"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.6.tgz#32552aa64b458392a85eab3b0b5ee61527167aeb"
Expand Down Expand Up @@ -8392,7 +8432,7 @@ table@^4.0.1:
slice-ansi "1.0.0"
string-width "^2.1.1"

tachyons@4.9.0:
tachyons@^4.9.0:
version "4.9.0"
resolved "https://registry.yarnpkg.com/tachyons/-/tachyons-4.9.0.tgz#2df058ea6b6eb3d2be12d62a69fecb0f6b1e0534"

Expand Down Expand Up @@ -8484,7 +8524,7 @@ thenify-all@^1.0.0, thenify-all@^1.6.0:
dependencies:
any-promise "^1.0.0"

through2@2.0.x, through2@^2.0.0, through2@^2.0.2, through2@^2.0.3:
through2@2.0.x, through2@^2.0.0, through2@^2.0.1, through2@^2.0.2, through2@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
dependencies:
Expand All @@ -8505,13 +8545,6 @@ through2@^1.0.0:
readable-stream ">=1.1.13-1 <1.2.0-0"
xtend ">=4.0.0 <4.1.0-0"

through2@^2.0.0, through2@^2.0.1, through2@^2.0.2, through2@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
dependencies:
readable-stream "^2.1.5"
xtend "~4.0.1"

through2@~0.4.1:
version "0.4.2"
resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.