feat: upgrade to aegir@9 (#33)

This commit is contained in:
Friedel Ziegelmayer 2016-11-03 09:53:50 +01:00 committed by David Dias
parent 0c6ad21c92
commit e73c99ee21
5 changed files with 38 additions and 23 deletions

1
.gitignore vendored
View File

@ -33,4 +33,3 @@ node_modules
.node_repl_history .node_repl_history
dist dist
lib

View File

@ -1,9 +1,17 @@
sudo: false sudo: false
language: node_js language: node_js
node_js:
- 4 matrix:
- 5 include:
- stable - node_js: 4
env: CXX=g++-4.8
- node_js: 6
env:
- SAUCE=true
- CXX=g++-4.8
- node_js: "stable"
env:
- CXX=g++-4.8
# Make sure we have new NPM. # Make sure we have new NPM.
before_install: before_install:
@ -14,12 +22,17 @@ script:
- npm test - npm test
- npm run coverage - npm run coverage
addons:
firefox: 'latest'
before_script: before_script:
- export DISPLAY=:99.0 - export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start - sh -e /etc/init.d/xvfb start
after_success: after_success:
- npm run coverage-publish - npm run coverage-publish
addons:
firefox: latest
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8

View File

@ -7,9 +7,14 @@
[![Travis CI](https://travis-ci.org/libp2p/js-libp2p-websockets.svg?branch=master)](https://travis-ci.org/libp2p/js-libp2p-websockets) [![Travis CI](https://travis-ci.org/libp2p/js-libp2p-websockets.svg?branch=master)](https://travis-ci.org/libp2p/js-libp2p-websockets)
[![Circle CI](https://circleci.com/gh/libp2p/js-libp2p-websockets.svg?style=svg)](https://circleci.com/gh/libp2p/js-libp2p-websockets) [![Circle CI](https://circleci.com/gh/libp2p/js-libp2p-websockets.svg?style=svg)](https://circleci.com/gh/libp2p/js-libp2p-websockets)
[![Dependency Status](https://david-dm.org/libp2p/js-libp2p-websockets.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websockets) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard) [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-websockets.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websockets) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square)
![](https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square)
[![Sauce Test Status](https://saucelabs.com/browser-matrix/js-libp2p-websockets.svg)](https://saucelabs.com/u/js-libp2p-websockets)
![](https://raw.githubusercontent.com/libp2p/interface-connection/master/img/badge.png) ![](https://raw.githubusercontent.com/libp2p/interface-connection/master/img/badge.png)
![](https://raw.githubusercontent.com/libp2p/interface-transport/master/img/badge.png) ![](https://raw.githubusercontent.com/libp2p/interface-transport/master/img/badge.png)
> JavaScript implementation of the WebSockets module that libp2p uses and that implements the interface-transport interface > JavaScript implementation of the WebSockets module that libp2p uses and that implements the interface-transport interface
## Description ## Description

View File

@ -2,8 +2,7 @@
"name": "libp2p-websockets", "name": "libp2p-websockets",
"version": "0.8.1", "version": "0.8.1",
"description": "JavaScript implementation of the WebSockets module that libp2p uses and that implements the interface-transport spec", "description": "JavaScript implementation of the WebSockets module that libp2p uses and that implements the interface-transport spec",
"main": "lib/index.js", "main": "src/index.js",
"jsnext:main": "src/index.js",
"scripts": { "scripts": {
"lint": "aegir-lint", "lint": "aegir-lint",
"test": "gulp test", "test": "gulp test",
@ -16,6 +15,9 @@
"coverage": "gulp coverage", "coverage": "gulp coverage",
"coverage-publish": "aegir-coverage publish" "coverage-publish": "aegir-coverage publish"
}, },
"browser": {
"pull-ws/server": false
},
"pre-commit": [ "pre-commit": [
"lint", "lint",
"test" "test"
@ -34,21 +36,20 @@
}, },
"homepage": "https://github.com/libp2p/js-libp2p-websockets#readme", "homepage": "https://github.com/libp2p/js-libp2p-websockets#readme",
"dependencies": { "dependencies": {
"detect-node": "^2.0.3", "interface-connection": "^0.3.0",
"interface-connection": "^0.2.1",
"lodash.contains": "^2.4.3", "lodash.contains": "^2.4.3",
"mafmt": "^2.1.1", "mafmt": "^2.1.2",
"pull-ws": "^3.2.3" "pull-ws": "^3.2.8"
}, },
"devDependencies": { "devDependencies": {
"aegir": "^8.0.0", "aegir": "^9.0.1",
"chai": "^3.5.0", "chai": "^3.5.0",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"interface-transport": "^0.3.3", "interface-transport": "^0.3.3",
"multiaddr": "^2.0.2", "multiaddr": "^2.0.3",
"pre-commit": "^1.1.3", "pre-commit": "^1.1.3",
"pull-goodbye": "0.0.1", "pull-goodbye": "0.0.1",
"pull-stream": "^3.4.3" "pull-stream": "^3.5.0"
}, },
"contributors": [ "contributors": [
"David Dias <daviddias.p@gmail.com>", "David Dias <daviddias.p@gmail.com>",
@ -56,4 +57,4 @@
"dignifiedquire <dignifiedquire@gmail.com>", "dignifiedquire <dignifiedquire@gmail.com>",
"greenkeeperio-bot <support@greenkeeper.io>" "greenkeeperio-bot <support@greenkeeper.io>"
] ]
} }

View File

@ -1,16 +1,13 @@
'use strict' 'use strict'
const isNode = require('detect-node')
const Connection = require('interface-connection').Connection const Connection = require('interface-connection').Connection
const contains = require('lodash.contains') const contains = require('lodash.contains')
// const IPFS_CODE = 421 // const IPFS_CODE = 421
let createServer let createServer = require('pull-ws/server')
if (isNode) { if (!createServer) {
createServer = require('pull-ws/server')
} else {
createServer = () => {} createServer = () => {}
} }