Skip to content

Commit 32deddc

Browse files
dignifiedquiredaviddias
authored andcommitted
feat: migrate out of protocol-buffers and into protons
* feat: upgrade to new aegir * feat: replace protocol-buffers with protons Ref ipfs/js-ipfs#991 * chore: fix travis config
1 parent c1070e0 commit 32deddc

File tree

5 files changed

+26
-31
lines changed

5 files changed

+26
-31
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,6 @@ node_modules
3333
.node_repl_history
3434

3535
dist
36+
37+
package-lock.js
38+
yarn.lock

.travis.yml

+1-12
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,20 @@ language: node_js
33

44
matrix:
55
include:
6-
- node_js: 4
7-
env: CXX=g++-4.8
86
- node_js: 6
97
env:
108
- CXX=g++-4.8
119
- node_js: stable
1210
env: CXX=g++-4.8
1311

14-
# Make sure we have new NPM.
15-
before_install:
16-
- npm install -g npm@4
17-
1812
script:
1913
- npm run lint
20-
- npm test
21-
- npm run coverage
22-
- make test
14+
- npm run test
2315

2416
before_script:
2517
- export DISPLAY=:99.0
2618
- sh -e /etc/init.d/xvfb start
2719

28-
after_success:
29-
- npm run coverage-publish
30-
3120
addons:
3221
firefox: 'latest'
3322
apt:

circle.yml

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ machine:
22
node:
33
version: stable
44

5+
post:
6+
test:
7+
- npm run coverage -- --upload
8+
59
dependencies:
610
pre:
711
- google-chrome --version

package.json

+16-17
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@
77
"fs": false
88
},
99
"scripts": {
10-
"test": "aegir-test",
11-
"test:node": "aegir-test node",
12-
"test:browser": "aegir-test browser",
13-
"build": "aegir-build",
14-
"lint": "aegir-lint",
15-
"release": "aegir-release",
16-
"release-minor": "aegir-release --minor",
17-
"release-major": "aegir-release --major",
18-
"coverage": "aegir-coverage",
19-
"coverage-publish": "aegir-coverage publish"
10+
"test": "aegir test",
11+
"test:node": "aegir test -t node",
12+
"test:browser": "aegir test -t browser -t webworker",
13+
"build": "aegir build",
14+
"lint": "aegir lint",
15+
"release": "aegir release",
16+
"release-minor": "aegir release --type minor",
17+
"release-major": "aegir release --type major",
18+
"coverage": "aegir coverage"
2019
},
2120
"repository": {
2221
"type": "git",
@@ -31,19 +30,19 @@
3130
"url": "https://github.com/ipfs/js-ipfs-unixfs/issues"
3231
},
3332
"engines": {
34-
"node": ">=4.0.0",
33+
"node": ">=6.0.0",
3534
"npm": ">=3.0.0"
3635
},
3736
"homepage": "https://github.com/ipfs/js-ipfs-unixfs#readme",
3837
"devDependencies": {
39-
"aegir": "^11.0.2",
40-
"chai": "^4.0.2",
41-
"dirty-chai": "^2.0.0",
38+
"aegir": "^12.0.4",
39+
"chai": "^4.1.2",
40+
"dirty-chai": "^2.0.1",
4241
"pre-commit": "^1.2.2",
43-
"safe-buffer": "^5.1.0"
42+
"safe-buffer": "^5.1.1"
4443
},
4544
"dependencies": {
46-
"protocol-buffers": "^3.2.1"
45+
"protons": "^1.0.0"
4746
},
4847
"pre-commit": [
4948
"lint",
@@ -57,4 +56,4 @@
5756
"Pedro Teixeira <i@pgte.me>",
5857
"Richard Littauer <richard.littauer@gmail.com>"
5958
]
60-
}
59+
}

src/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

3-
const protobuf = require('protocol-buffers')
4-
const pb = protobuf(require('./unixfs.proto'))
3+
const protons = require('protons')
4+
const pb = protons(require('./unixfs.proto'))
55
// encode/decode
66
const unixfsData = pb.Data
77
// const unixfsMetadata = pb.MetaData // encode/decode

0 commit comments

Comments
 (0)