From 14af248b6964b4e6f321b0c371d3c7054f8ed336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 28 Oct 2018 19:48:12 +0100 Subject: [PATCH] feat: use crypto instead of webcrypto also: * drop old ci, use jenkins * upgrade all deps --- appveyor.yml | 29 ----------------------------- ci/Jenkinsfile | 2 +- circle.yml | 15 --------------- package.json | 9 ++++----- src/index.js | 2 +- 5 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 appveyor.yml delete mode 100644 circle.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 046bf91..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,29 +0,0 @@ -# Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories. -version: "{build}" - -environment: - matrix: - - nodejs_version: "6" - - nodejs_version: "8" - -matrix: - fast_finish: true - -install: - # Install Node.js - - ps: Install-Product node $env:nodejs_version - - # Upgrade npm - - npm install -g npm - - # Output our current versions for debugging - - node --version - - npm --version - - # Install our package dependencies - - npm install - -test_script: - - npm run test:node - -build: off diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index a7da2e5..50da4f7 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -1,2 +1,2 @@ // Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories. -javascript() +javascript([coverage: true]) diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 0009693..0000000 --- a/circle.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories. -machine: - node: - version: stable - -dependencies: - pre: - - google-chrome --version - - curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - - sudo dpkg -i google-chrome.deb || true - - sudo apt-get update - - sudo apt-get install -f - - sudo apt-get install --only-upgrade lsb-base - - sudo dpkg -i google-chrome.deb - - google-chrome --version diff --git a/package.json b/package.json index 025a086..5b558a2 100644 --- a/package.json +++ b/package.json @@ -35,13 +35,12 @@ }, "dependencies": { "blakejs": "^1.1.0", - "js-sha3": "^0.7.0", - "multihashes": "~0.4.12", - "webcrypto": "~0.1.1" + "js-sha3": "~0.8.0", + "multihashes": "~0.4.14" }, "devDependencies": { - "aegir": "^12.3.0", - "chai": "^4.1.2", + "aegir": "^17.0.0", + "chai": "^4.2.0", "dirty-chai": "^2.0.1", "pre-commit": "^1.2.2" }, diff --git a/src/index.js b/src/index.js index 1624e61..0d19296 100644 --- a/src/index.js +++ b/src/index.js @@ -3,7 +3,7 @@ const multihash = require('multihashes') const blake = require('./blake') const sha3 = require('./sha3') -const crypto = require('webcrypto') +const crypto = require('crypto') const mh = module.exports = Multihashing