Merge "[FAB-6870] Update node modules versions"

This commit is contained in:
Gari Singh 2017-11-06 18:37:53 +00:00 committed by Gerrit Code Review
commit b09febd2b6
4 changed files with 10 additions and 3 deletions

2
.gitignore vendored
View file

@ -20,8 +20,10 @@ chaincode-docker-devmode/chaincode/chaincode_example02/chaincode_example02
# fabric sdk node modules # fabric sdk node modules
fabcar/node_modules/ fabcar/node_modules/
fabcar/package-lock.json fabcar/package-lock.json
fabcar/hfc-key-store/
# balance transfer sample # balance transfer sample
balance-transfer/.DS_Store balance-transfer/.DS_Store
balance-transfer/node_modules/* balance-transfer/node_modules/*
balance-transfer/package-lock.json balance-transfer/package-lock.json
balance-transfer/fabric-client-kv-org*

View file

@ -6,7 +6,9 @@
"node": ">=8.4.0", "node": ">=8.4.0",
"npm": ">=5.3.0" "npm": ">=5.3.0"
}, },
"scripts": { "start" : "node fabcar.js" }, "scripts": {
"start": "node fabcar.js"
},
"engine-strict": true, "engine-strict": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {

View file

@ -7,8 +7,8 @@
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
}, },
"dependencies": { "dependencies": {
"fabric-ca-client": "^1.0.2", "fabric-ca-client": "unstable",
"fabric-client": "^1.0.2", "fabric-client": "unstable",
"grpc": "^1.6.0" "grpc": "^1.6.0"
}, },
"author": "Anthony O'Dowd", "author": "Anthony O'Dowd",

View file

@ -16,6 +16,9 @@ if [ "$LANGUAGE" = "node" -o "$LANGUAGE" = "NODE" ]; then
CC_SRC_PATH=/opt/gopath/src/github.com/fabcar/node CC_SRC_PATH=/opt/gopath/src/github.com/fabcar/node
fi fi
# clean the keystore
rm -rf ./hfc-key-store
# launch network; create channel and join peer to channel # launch network; create channel and join peer to channel
cd ../basic-network cd ../basic-network
./start.sh ./start.sh