From 2c204260c5a404932f5a10e6c7732be0de36fac3 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Tue, 5 Sep 2017 12:52:01 +0200 Subject: [PATCH 1/3] feat: upgrade to new aegir --- .travis.yml | 11 +---------- circle.yml | 4 ++++ package.json | 29 ++++++++++++++--------------- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5cc672b8..1468764a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,23 +11,14 @@ matrix: - node_js: stable env: CXX=g++-4.8 -# Make sure we have new NPM. -before_install: - - npm install -g npm@4 - script: - npm run lint - - npm test - - npm run coverage - - make test + - npm run test before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start -after_success: - - npm run coverage-publish - addons: firefox: 'latest' apt: diff --git a/circle.yml b/circle.yml index 56f7efbe..e8305206 100644 --- a/circle.yml +++ b/circle.yml @@ -2,6 +2,10 @@ machine: node: version: stable +post: + test: + - npm run coverage -- --upload + dependencies: pre: - google-chrome --version diff --git a/package.json b/package.json index 3d900c9e..fb68e41f 100644 --- a/package.json +++ b/package.json @@ -7,16 +7,15 @@ "fs": false }, "scripts": { - "test": "aegir-test", - "test:node": "aegir-test node", - "test:browser": "aegir-test browser", - "build": "aegir-build", - "lint": "aegir-lint", - "release": "aegir-release", - "release-minor": "aegir-release --minor", - "release-major": "aegir-release --major", - "coverage": "aegir-coverage", - "coverage-publish": "aegir-coverage publish" + "test": "aegir test", + "test:node": "aegir test -t node", + "test:browser": "aegir test -t browser -t webworker", + "build": "aegir build", + "lint": "aegir lint", + "release": "aegir release", + "release-minor": "aegir release --type minor", + "release-major": "aegir release --type major", + "coverage": "aegir coverage --ignore src/unixfs.proto.js" }, "repository": { "type": "git", @@ -36,11 +35,11 @@ }, "homepage": "https://github.com/ipfs/js-ipfs-unixfs#readme", "devDependencies": { - "aegir": "^11.0.2", - "chai": "^4.0.2", - "dirty-chai": "^2.0.0", + "aegir": "^12.0.4", + "chai": "^4.1.2", + "dirty-chai": "^2.0.1", "pre-commit": "^1.2.2", - "safe-buffer": "^5.1.0" + "safe-buffer": "^5.1.1" }, "dependencies": { "protocol-buffers": "^3.2.1" @@ -57,4 +56,4 @@ "Pedro Teixeira ", "Richard Littauer " ] -} \ No newline at end of file +} From 4c0409c04140d94ac4f06bfec8c78d9fe2d3f7be Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Thu, 7 Sep 2017 10:40:07 +0200 Subject: [PATCH 2/3] feat: replace protocol-buffers with protons Ref https://github.com/ipfs/js-ipfs/issues/991 --- .gitignore | 3 +++ .travis.yml | 1 - package.json | 6 +++--- src/index.js | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c2ba6370..923c22a3 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,6 @@ node_modules .node_repl_history dist + +package-lock.js +yarn.lock \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 1468764a..c6769a45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ language: node_js matrix: include: - - node_js: 4 env: CXX=g++-4.8 - node_js: 6 env: diff --git a/package.json b/package.json index fb68e41f..c065b6bf 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "release": "aegir release", "release-minor": "aegir release --type minor", "release-major": "aegir release --type major", - "coverage": "aegir coverage --ignore src/unixfs.proto.js" + "coverage": "aegir coverage" }, "repository": { "type": "git", @@ -30,7 +30,7 @@ "url": "https://github.com/ipfs/js-ipfs-unixfs/issues" }, "engines": { - "node": ">=4.0.0", + "node": ">=6.0.0", "npm": ">=3.0.0" }, "homepage": "https://github.com/ipfs/js-ipfs-unixfs#readme", @@ -42,7 +42,7 @@ "safe-buffer": "^5.1.1" }, "dependencies": { - "protocol-buffers": "^3.2.1" + "protons": "^1.0.0" }, "pre-commit": [ "lint", diff --git a/src/index.js b/src/index.js index 9793c687..68179dfe 100644 --- a/src/index.js +++ b/src/index.js @@ -1,7 +1,7 @@ 'use strict' -const protobuf = require('protocol-buffers') -const pb = protobuf(require('./unixfs.proto')) +const protons = require('protons') +const pb = protons(require('./unixfs.proto')) // encode/decode const unixfsData = pb.Data // const unixfsMetadata = pb.MetaData // encode/decode From c8cbbb7ac4aa5aec56663dab4edeb62e9bc26a24 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Thu, 7 Sep 2017 10:44:03 +0200 Subject: [PATCH 3/3] chore: fix travis config --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c6769a45..5918cb31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ language: node_js matrix: include: - env: CXX=g++-4.8 - node_js: 6 env: - CXX=g++-4.8