Skip to content
This repository has been archived by the owner on Jun 7, 2019. It is now read-only.

Commit

Permalink
Merge branch '1.0.0' into 240-parameter_to_sendRequest
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobias Schwarz committed Aug 9, 2017
2 parents a4c7581 + 758ff26 commit 07a5ef1
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 55 deletions.
110 changes: 55 additions & 55 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
{
"name": "lisk-js",
"version": "0.4.5",
"description": "JavaScript library for sending Lisk transactions from the client or server",
"main": "./dist-node/index.js",
"scripts": {
"test": "nyc mocha test/**/*.js",
"test:watch": "chokidar \"./(src|test)/**/*.js\" -c \"mocha test/**/*.js\" --initial",
"test:now": "npm run test -- --grep @now",
"test:now:watch": "chokidar \"./(src|test)/**/*.js\" -c \"mocha test/**/*.js\" --initial",
"cover": "istanbul cover --dir ./coverage _mocha",
"eslint": "./node_modules/.bin/grunt eslint --verbose",
"jenkins": "./node_modules/.bin/grunt jenkins --verbose",
"build": "grunt",
"prepush": "grunt eslint && npm test",
"prepublishOnly": "npm run build"
},
"repository": {
"type": "git",
"url": "git@github.com:LiskHQ/lisk-js.git"
},
"author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
"license": "GPL-3.0",
"dependencies": {
"browserify-bignum": "=1.3.0-2",
"buffer": "=5.0.6",
"bytebuffer": "=5.0.1",
"crypto-browserify": "=3.11.0",
"ed2curve": "=0.2.1",
"js-nacl": "LiskHQ/js-nacl#6dc1417",
"popsicle": "=9.1.0"
},
"devDependencies": {
"babel-cli": "=6.24.1",
"babel-polyfill": "=6.23.0",
"babel-preset-env": "=1.6.0",
"chokidar-cli": "=1.2.0",
"coveralls": "=2.13.1",
"eslint-config-airbnb-base": "=11.3.1",
"eslint-config-lisk-base": "=0.1.0",
"eslint-plugin-import": "=2.7.0",
"grunt": "=1.0.1",
"grunt-browserify": "=5.0.0",
"grunt-contrib-uglify": "=3.0.1",
"grunt-coveralls": "=1.0.1",
"grunt-eslint": "=20.0.0",
"grunt-exec": "=2.0.0",
"husky": "=0.14.3",
"istanbul": "=0.4.5",
"load-grunt-tasks": "=3.5.2",
"mocha": "=3.4.2",
"mocha-lcov-reporter": "=1.3.0",
"nyc": "=10.3.2",
"should": "=11.2.1",
"sinon": "=2.2.0"
}
"name": "lisk-js",
"version": "0.4.5",
"description": "JavaScript library for sending Lisk transactions from the client or server",
"main": "./dist-node/index.js",
"scripts": {
"test": "nyc mocha test/**/*.js",
"test:watch": "chokidar \"./(src|test)/**/*.js\" -c \"mocha test/**/*.js\" --initial",
"test:now": "npm run test -- --grep @now",
"test:now:watch": "chokidar \"./(src|test)/**/*.js\" -c \"mocha test/**/*.js --grep @now\" --initial",
"cover": "istanbul cover --dir ./coverage _mocha",
"eslint": "./node_modules/.bin/grunt eslint --verbose",
"jenkins": "./node_modules/.bin/grunt jenkins --verbose",
"build": "grunt",
"prepush": "grunt eslint && npm test",
"prepublishOnly": "npm run build"
},
"repository": {
"type": "git",
"url": "git@github.com:LiskHQ/lisk-js.git"
},
"author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
"license": "GPL-3.0",
"dependencies": {
"babel-polyfill": "=6.23.0",
"browserify-bignum": "=1.3.0-2",
"buffer": "=5.0.6",
"bytebuffer": "=5.0.1",
"crypto-browserify": "=3.11.0",
"ed2curve": "=0.2.1",
"js-nacl": "LiskHQ/js-nacl#6dc1417",
"popsicle": "=9.1.0"
},
"devDependencies": {
"babel-cli": "=6.24.1",
"babel-preset-env": "=1.6.0",
"chokidar-cli": "=1.2.0",
"coveralls": "=2.13.1",
"eslint-config-airbnb-base": "=11.3.1",
"eslint-config-lisk-base": "=0.1.0",
"eslint-plugin-import": "=2.7.0",
"grunt": "=1.0.1",
"grunt-browserify": "=5.0.0",
"grunt-contrib-uglify": "=3.0.1",
"grunt-coveralls": "=1.0.1",
"grunt-eslint": "=20.0.0",
"grunt-exec": "=2.0.0",
"husky": "=0.14.3",
"istanbul": "=0.4.5",
"load-grunt-tasks": "=3.5.2",
"mocha": "=3.4.2",
"mocha-lcov-reporter": "=1.3.0",
"nyc": "=10.3.2",
"should": "=11.2.1",
"sinon": "=2.2.0"
}
}
1 change: 1 addition & 0 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* @module lisk
* @main lisk
*/
import 'babel-polyfill';
import naclFactory from 'js-nacl';
import buffer from 'buffer';
import crypto from './transactions/crypto';
Expand Down

0 comments on commit 07a5ef1

Please sign in to comment.