Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

Commit 8c01a17

Browse files
author
Alan Shaw
authored
Merge branch 'master' into feat/support-file-dom-api
2 parents ad0a1ad + 6dc9075 commit 8c01a17

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1177
-151
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1036,13 +1036,13 @@ Listing of the main packages used in the IPFS ecosystem. There are also three sp
10361036
| [`libp2p-floodsub`](//github.com/libp2p/js-libp2p-floodsub) | [![npm](https://img.shields.io/npm/v/libp2p-floodsub.svg?maxAge=86400&style=flat)](//github.com/libp2p/js-libp2p-floodsub/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-floodsub.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-floodsub) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-floodsub.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-floodsub) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-floodsub/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-floodsub) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
10371037
| [`libp2p-kad-dht`](//github.com/libp2p/js-libp2p-kad-dht) | [![npm](https://img.shields.io/npm/v/libp2p-kad-dht.svg?maxAge=86400&style=flat)](//github.com/libp2p/js-libp2p-kad-dht/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-kad-dht.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-kad-dht.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-kad-dht) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-kad-dht/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
10381038
| [`libp2p-mdns`](//github.com/libp2p/js-libp2p-mdns) | [![npm](https://img.shields.io/npm/v/libp2p-mdns.svg?maxAge=86400&style=flat)](//github.com/libp2p/js-libp2p-mdns/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-mdns.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-mdns) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-mdns.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-mdns) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-mdns/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-mdns) | [Jacob Heun](mailto:jacobheun@gmail.com) |
1039-
| [`libp2p-mplex`](//github.com/libp2p/js-libp2p-mplex) | [![npm](https://img.shields.io/npm/v/libp2p-mplex.svg?maxAge=86400&style=flat)](//github.com/libp2p/js-libp2p-mplex/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-mplex.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-mplex) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-mplex.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-mplex) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-mplex/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-mplex) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
10401039
| [`libp2p-bootstrap`](//github.com/libp2p/js-libp2p-bootstrap) | [![npm](https://img.shields.io/npm/v/libp2p-bootstrap.svg?maxAge=86400&style=flat)](//github.com/libp2p/js-libp2p-bootstrap/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-bootstrap.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-bootstrap) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-bootstrap.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-bootstrap) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-bootstrap/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-bootstrap) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
10411040
| [`libp2p-secio`](//github.com/libp2p/js-libp2p-secio) | [![npm](https://img.shields.io/npm/v/libp2p-secio.svg?maxAge=86400&style=flat)](//github.com/libp2p/js-libp2p-secio/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-secio.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-secio) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-secio.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-secio) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-secio/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-secio) | [Friedel Ziegelmayer](mailto:dignifiedquire@gmail.com) |
10421041
| [`libp2p-tcp`](//github.com/libp2p/js-libp2p-tcp) | [![npm](https://img.shields.io/npm/v/libp2p-tcp.svg?maxAge=86400&style=flat)](//github.com/libp2p/js-libp2p-tcp/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-tcp.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-tcp) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-tcp.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-tcp) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-tcp/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-tcp) | [Jacob Heun](mailto:jacobheun@gmail.com) |
10431042
| [`libp2p-webrtc-star`](//github.com/libp2p/js-libp2p-webrtc-star) | [![npm](https://img.shields.io/npm/v/libp2p-webrtc-star.svg?maxAge=86400&style=flat)](//github.com/libp2p/js-libp2p-webrtc-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-webrtc-star.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-webrtc-star) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-webrtc-star.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-webrtc-star) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
10441043
| [`libp2p-websocket-star`](//github.com/libp2p/js-libp2p-websocket-star) | [![npm](https://img.shields.io/npm/v/libp2p-websocket-star.svg?maxAge=86400&style=flat)](//github.com/libp2p/js-libp2p-websocket-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websocket-star.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-websocket-star) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-websocket-star.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-websocket-star) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websocket-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websocket-star) | [Jacob Heun](mailto:jacobheun@gmail.com) |
10451044
| [`libp2p-websockets`](//github.com/libp2p/js-libp2p-websockets) | [![npm](https://img.shields.io/npm/v/libp2p-websockets.svg?maxAge=86400&style=flat)](//github.com/libp2p/js-libp2p-websockets/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websockets.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-websockets) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-websockets.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-websockets) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websockets/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websockets) | [Jacob Heun](mailto:jacobheun@gmail.com) |
1045+
| [`pull-mplex`](//github.com/libp2p/pull-mplex) | [![npm](https://img.shields.io/npm/v/pull-mplex.svg?maxAge=86400&style=flat)](//github.com/libp2p/pull-mplex/releases) | [![Deps](https://david-dm.org/libp2p/pull-mplex.svg?style=flat)](https://david-dm.org/libp2p/pull-mplex) | [![Travis CI](https://travis-ci.com/libp2p/pull-mplex.svg?branch=master)](https://travis-ci.com/libp2p/pull-mplex) | [![codecov](https://codecov.io/gh/libp2p/pull-mplex/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/pull-mplex) | [Jacob Heun](mailto:jacobheun@gmail.com) |
10461046
| **Data Types** |
10471047
| [`ipfs-block`](//github.com/ipfs/js-ipfs-block) | [![npm](https://img.shields.io/npm/v/ipfs-block.svg?maxAge=86400&style=flat)](//github.com/ipfs/js-ipfs-block/releases) | [![Deps](https://david-dm.org/ipfs/js-ipfs-block.svg?style=flat)](https://david-dm.org/ipfs/js-ipfs-block) | [![Travis CI](https://travis-ci.com/ipfs/js-ipfs-block.svg?branch=master)](https://travis-ci.com/ipfs/js-ipfs-block) | [![codecov](https://codecov.io/gh/ipfs/js-ipfs-block/branch/master/graph/badge.svg)](https://codecov.io/gh/ipfs/js-ipfs-block) | [Volker Mische](mailto:volker.mische@gmail.com) |
10481048
| [`ipfs-unixfs`](//github.com/ipfs/js-ipfs-unixfs) | [![npm](https://img.shields.io/npm/v/ipfs-unixfs.svg?maxAge=86400&style=flat)](//github.com/ipfs/js-ipfs-unixfs/releases) | [![Deps](https://david-dm.org/ipfs/js-ipfs-unixfs.svg?style=flat)](https://david-dm.org/ipfs/js-ipfs-unixfs) | [![Travis CI](https://travis-ci.com/ipfs/js-ipfs-unixfs.svg?branch=master)](https://travis-ci.com/ipfs/js-ipfs-unixfs) | [![codecov](https://codecov.io/gh/ipfs/js-ipfs-unixfs/branch/master/graph/badge.svg)](https://codecov.io/gh/ipfs/js-ipfs-unixfs) | [Alex Potsides](mailto:alex.potsides@protocol.ai) |

‎examples/browser-browserify/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
"license": "MIT",
1313
"devDependencies": {
1414
"ipfs": "file:../../",
15-
"browserify": "^14.0.0",
16-
"concat-stream": "^1.6.0",
17-
"http-server": "~0.9.0"
15+
"browserify": "^16.2.3",
16+
"concat-stream": "^2.0.0",
17+
"http-server": "~0.11.1"
1818
},
1919
"dependencies": {}
2020
}

‎examples/browser-create-react-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"dot-prop": "^4.2.0",
6+
"dot-prop": "^5.0.0",
77
"ipfs": "file:../../",
88
"ipfs-css": "^0.12.0",
99
"react": "^16.8.0",
1010
"react-dom": "^16.8.0",
11-
"react-scripts": "2.1.3",
11+
"react-scripts": "3.0.1",
1212
"tachyons": "^4.11.1"
1313
},
1414
"scripts": {

‎examples/browser-mfs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"devDependencies": {
1414
"html-webpack-plugin": "^3.2.0",
1515
"http-server": "~0.11.1",
16-
"uglifyjs-webpack-plugin": "^1.2.0",
16+
"uglifyjs-webpack-plugin": "^2.1.2",
1717
"webpack": "^4.15.1",
1818
"webpack-cli": "^3.0.8"
1919
},

‎examples/browser-readablestream/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"webpack": "^4.28.4"
1818
},
1919
"dependencies": {
20-
"videostream": "^2.4.2"
20+
"videostream": "^3.2.0"
2121
}
2222
}

‎examples/circuit-relaying/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"devDependencies": {
2121
"aegir": "^18.0.3",
22-
"ipfs-css": "~0.2.0",
22+
"ipfs-css": "~0.12.0",
2323
"parcel-bundler": "^1.6.2",
2424
"tachyons": "^4.9.1"
2525
},

‎examples/custom-ipfs-repo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"license": "MIT",
1111
"dependencies": {
12-
"datastore-fs": "~0.7.0",
12+
"datastore-fs": "~0.8.0",
1313
"ipfs": "file:../../",
1414
"ipfs-repo": "~0.26.1"
1515
}

‎examples/custom-libp2p/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const WebSocketStar = require('libp2p-websocket-star')
88
const Bootstrap = require('libp2p-bootstrap')
99
const SPDY = require('libp2p-spdy')
1010
const KadDHT = require('libp2p-kad-dht')
11-
const MPLEX = require('libp2p-mplex')
11+
const MPLEX = require('pull-mplex')
1212
const SECIO = require('libp2p-secio')
1313
const assert = require('assert')
1414

‎examples/custom-libp2p/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
"libp2p-bootstrap": "~0.9.7",
1515
"libp2p-kad-dht": "~0.14.12",
1616
"libp2p-mdns": "~0.12.2",
17-
"libp2p-mplex": "~0.8.5",
1817
"libp2p-secio": "~0.11.1",
1918
"libp2p-spdy": "~0.13.3",
2019
"libp2p-tcp": "~0.13.0",
21-
"libp2p-websocket-star": "~0.10.2"
20+
"libp2p-websocket-star": "~0.10.2",
21+
"pull-mplex": "~0.1.0"
2222
}
2323
}

‎examples/exchange-files-in-browser/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
},
99
"license": "MIT",
1010
"devDependencies": {
11-
"browserify": "^16.2.0",
12-
"http-server": "^0.11.1"
11+
"browserify": "^16.2.3",
12+
"http-server": "~0.11.1"
1313
},
1414
"dependencies": {
1515
"ipfs": "file:../../",

‎examples/run-in-electron/README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,5 @@ To try it by yourself, do:
66

77
```
88
> npm install
9-
> ./node_modules/.bin/electron-rebuild
10-
# or
11-
> ./build.sh
12-
#
13-
# You can also try to use `npm start` to see where electron errors
9+
> npm start
1410
```

‎examples/run-in-electron/main.js

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
'use strict'
22

3-
const electron = require('electron')
4-
const app = electron.app
5-
const BrowserWindow = electron.BrowserWindow
6-
7-
const IPFS = require('ipfs')
8-
const path = require('path')
9-
const url = require('url')
3+
const { app, BrowserWindow } = require('electron')
104

115
let mainWindow
126

137
function createWindow () {
14-
mainWindow = new BrowserWindow({ width: 800, height: 600 })
8+
mainWindow = new BrowserWindow({ width: 800,
9+
height: 600,
10+
webPreferences: {
11+
nodeIntegration: true
12+
} })
1513

1614
// and load the index.html of the app.
17-
mainWindow.loadURL(url.format({
18-
pathname: path.join(__dirname, 'index.html'),
19-
protocol: 'file:',
20-
slashes: true
21-
}))
15+
mainWindow.loadFile('index.html')
2216

2317
// Open the DevTools.
2418
mainWindow.webContents.openDevTools()
@@ -32,9 +26,8 @@ function createWindow () {
3226
app.on('ready', () => {
3327
createWindow()
3428

35-
// Spawn your IPFS node \o/
29+
const IPFS = require('ipfs')
3630
const node = new IPFS()
37-
3831
node.on('ready', () => {
3932
node.id((err, id) => {
4033
if (err) {
@@ -43,6 +36,9 @@ app.on('ready', () => {
4336
console.log(id)
4437
})
4538
})
39+
node.on('error', (err) => {
40+
return console.log(err)
41+
})
4642
})
4743

4844
// Quit when all windows are closed.

‎examples/run-in-electron/package.json

100755100644
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "main.js",
66
"scripts": {
77
"start": "electron .",
8-
"postinstall": "electron-rebuild"
8+
"postinstall": "./rebuild.sh"
99
},
1010
"keywords": [
1111
"Electron",
@@ -15,8 +15,13 @@
1515
"author": "David Dias <daviddias@ipfs.io>",
1616
"license": "MIT",
1717
"devDependencies": {
18-
"electron": "^2.0.0",
19-
"electron-rebuild": "^1.7.2",
18+
"electron": "^4.2.0",
19+
"electron-rebuild": "^1.8.4",
2020
"ipfs": "ipfs/js-ipfs"
21+
},
22+
"greenkeeper": {
23+
"ignore": [
24+
"electron"
25+
]
2126
}
2227
}

‎examples/run-in-electron/build.sh renamed to ‎examples/run-in-electron/rebuild.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Electron's version.
2-
export npm_config_target=2.0.0
2+
export npm_config_target=4.2.0
33
# The architecture of Electron, can be ia32 or x64.
44
export npm_config_arch=x64
55
export npm_config_target_arch=x64
@@ -10,4 +10,4 @@ export npm_config_runtime=electron
1010
# Tell node-pre-gyp to build module from source code.
1111
export npm_config_build_from_source=true
1212
# Install all dependencies, and store cache to ~/.electron-gyp.
13-
HOME=~/.electron-gyp npm install
13+
HOME=~/.electron-gyp npm rebuild

‎examples/run-in-electron/renderer.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// This file is required by the index.html file and will
2+
// be executed in the renderer process for that window.
3+
// All of the Node.js APIs are available in this process.

‎greenkeeper.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"groups": {
3+
"default": {
4+
"packages": [
5+
"package.json"
6+
]
7+
},
8+
"examples": {
9+
"packages": [
10+
"examples/browser-browserify/package.json",
11+
"examples/browser-create-react-app/package.json",
12+
"examples/browser-mfs/package.json",
13+
"examples/browser-parceljs/package.json",
14+
"examples/browser-readablestream/package.json",
15+
"examples/browser-webpack/package.json",
16+
"examples/circuit-relaying/package.json",
17+
"examples/custom-ipfs-repo/package.json",
18+
"examples/custom-libp2p/package.json",
19+
"examples/exchange-files-in-browser/package.json",
20+
"examples/ipfs-101/package.json",
21+
"examples/run-in-electron/package.json"
22+
]
23+
}
24+
}
25+
}

‎maintainer.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"repoLeadMaintainer": {
3+
"name": "Alan Shaw",
4+
"email": "alan.shaw@protocol.ai",
5+
"username": "alanshaw"
6+
},
7+
"workingGroup": {
8+
"name": "JS IPFS",
9+
"entryPoint": "https://github.com/ipfs/js-core"
10+
}
11+
}

‎package-list.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
["libp2p/js-libp2p-floodsub", "libp2p-floodsub"],
3030
["libp2p/js-libp2p-kad-dht", "libp2p-kad-dht"],
3131
["libp2p/js-libp2p-mdns", "libp2p-mdns"],
32-
["libp2p/js-libp2p-mplex", "libp2p-mplex"],
3332
["libp2p/js-libp2p-bootstrap", "libp2p-bootstrap"],
3433
["libp2p/js-libp2p-secio", "libp2p-secio"],
3534
["libp2p/js-libp2p-tcp", "libp2p-tcp"],
3635
["libp2p/js-libp2p-webrtc-star", "libp2p-webrtc-star"],
3736
["libp2p/js-libp2p-websocket-star", "libp2p-websocket-star"],
3837
["libp2p/js-libp2p-websockets", "libp2p-websockets"],
38+
["libp2p/pull-mplex", "pull-mplex"],
3939

4040
"Data Types",
4141
["ipfs/js-ipfs-block", "ipfs-block"],

0 commit comments

Comments
 (0)