Sanitise dependencies (#3798)

* add in peer dependencies for composer-common Signed-off-by: Matthew B White <[email protected]> * add composer-commmon to dev dependencies for testing Signed-off-by: Matthew B White <[email protected]> * updates Signed-off-by: Matthew B White <[email protected]> * merges and ensure up-to- 0.19.3 Signed-off-by: Matthew B White <[email protected]> * fix wrong dependancy, and fail integration tests fast Signed-off-by: Matthew B White <[email protected]>
hyperledger-archives · Apr 27, 2018 · 02ea0e0 · 02ea0e0
1 parent 3f07488
commit 02ea0e0
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 37 deletions.
diff --git a/package.json b/package.json
@@ -80,4 +80,4 @@
       }
     }
   }
-}
+}
diff --git a/packages/composer-common/lib/codegen/javascriptparser.js b/packages/composer-common/lib/codegen/javascriptparser.js
@@ -15,7 +15,6 @@
 'use strict';
 
 const doctrine = require('doctrine');
-// const esprima = require('esprima');  see comment in getExample fn
 const acorn = require('acorn');
 
 /**
@@ -548,16 +547,6 @@ class JavaScriptParser {
             result = tags[0].description;
         }
 
-        // Currently esprima seems to have a problem with the async await code.
-        // TODO: Investigate if this can be handled
-        // try {
-        //     // Pass as a function so that return statements are valid
-        //     let program = 'function testSyntax() {' + result + '}';
-        //     esprima.parse(program);
-        // } catch (e) {
-        //     throw Error('Malformed JSDoc Comment. Invalid @example tag: ' + comment);
-        // }
-
         return result;
     }
 }

diff --git a/packages/composer-common/lib/serializer/instancegenerator.js b/packages/composer-common/lib/serializer/instancegenerator.js
@@ -17,7 +17,8 @@
 const ClassDeclaration = require('../introspect/classdeclaration');
 const EnumDeclaration = require('../introspect/enumdeclaration');
 const Field = require('../introspect/field');
-const leftPad = require('left-pad');
+// const leftPad = require('left-pad');
+const padStart = require('lodash.padstart');
 const ModelUtil = require('../modelutil');
 const RelationshipDeclaration = require('../introspect/relationshipdeclaration');
 const Util = require('../util');
@@ -218,7 +219,7 @@ class InstanceGenerator {
      */
     generateRandomId(classDeclaration) {
         let id = Math.round(Math.random() * 9999).toString();
-        id = leftPad(id, 4, '0');
+        id = padStart(id, 4, '0');
         return id;
     }
 

diff --git a/packages/composer-common/package.json b/packages/composer-common/package.json
@@ -55,16 +55,16 @@
   "dependencies": {
     "acorn": "5.1.2",
     "axios": "0.17.1",
-    "commander": "2.9.0",
+    "comment-parser": "0.4.0",
     "config": "1.24.0",
     "debug": "2.6.2",
     "doctrine": "2.0.0",
     "fs-extra": "1.0.0",
     "js-yaml": "3.10.0",
     "jsrsasign": "8.0.3",
     "jszip": "3.1.3",
-    "left-pad": "1.1.3",
-    "lodash": "4.17.4",
+    "lodash.clonedeep": "4.5.0",
+    "lodash.padstart": "4.5.0",
     "lorem-ipsum": "1.0.4",
     "minimatch": "3.0.3",
     "mkdirp": "0.5.1",

diff --git a/packages/composer-connector-hlfv1/package.json b/packages/composer-connector-hlfv1/package.json
@@ -63,8 +63,10 @@
       }
     }
   },
+  "peerDependencies": {
+    "composer-common": "0.19.3"
+  },
   "dependencies": {
-    "composer-common": "0.19.3",
     "fabric-ca-client": "1.1.0",
     "fabric-client": "1.1.0",
     "fs-extra": "1.0.0",
@@ -83,7 +85,8 @@
     "license-check-and-add": "2.3.1",
     "mocha": "3.4.2",
     "nyc": "11.1.0",
-    "sinon": "2.3.8"
+    "sinon": "2.3.8",
+    "composer-common": "0.19.3"
   },
   "nyc": {
     "exclude": [

diff --git a/packages/composer-connector-proxy/package.json b/packages/composer-connector-proxy/package.json
@@ -73,10 +73,13 @@
     "proxyquire": "1.7.11",
     "serializerr": "1.0.3",
     "sinon": "2.3.8",
-    "watchify": "3.7.0"
+    "watchify": "3.7.0",
+    "composer-common": "0.19.3"
+  },
+  "peerDependencies": {
+    "composer-common": "0.19.3"
   },
   "dependencies": {
-    "composer-common": "0.19.3",
     "socket.io-client": "1.7.3"
   },
   "nyc": {

diff --git a/packages/composer-connector-server/package.json b/packages/composer-connector-server/package.json
@@ -66,15 +66,18 @@
       }
     }
   },
+  "peerDependencies": {
+    "composer-common": "0.19.3"
+  },
   "dependencies": {
-    "composer-common": "0.19.3",
     "composer-connector-hlfv1": "0.19.3",
     "serializerr": "1.0.3",
     "socket.io": "1.7.3",
     "uuid": "3.0.1",
     "yargs": "10.0.3"
   },
   "devDependencies": {
+    "composer-common": "0.19.3",
     "chai": "3.5.0",
     "composer-connector-embedded": "0.19.3",
     "eslint": "3.17.1",

diff --git a/packages/composer-connector-web/package.json b/packages/composer-connector-web/package.json
@@ -86,10 +86,13 @@
     "mocha": "3.4.2",
     "sinon": "2.3.8",
     "transform-loader": "0.2.4",
-    "watchify": "3.7.0"
+    "watchify": "3.7.0",
+    "composer-common": "0.19.3"
+  },
+  "peerDependencies": {
+    "composer-common": "0.19.3"
   },
   "dependencies": {
-    "composer-common": "0.19.3",
     "composer-runtime": "0.19.3",
     "composer-runtime-web": "0.19.3",
     "uuid": "3.0.1"

diff --git a/packages/composer-documentation/package.json b/packages/composer-documentation/package.json
@@ -69,7 +69,8 @@
       "_configs",
       "_template",
       "bin/opus",
-      "test/testfile.md"
+      "test/testfile.md",
+      "_tmp"
     ],
     "file_type_method": "EXCLUDE",
     "file_types": [

diff --git a/packages/composer-runtime-embedded/package.json b/packages/composer-runtime-embedded/package.json
@@ -72,8 +72,10 @@
       }
     }
   },
+  "peerDependencies": {
+    "composer-common": "0.19.3"
+  },  
   "dependencies": {
-    "composer-common": "0.19.3",
     "composer-runtime": "0.19.3",
     "composer-runtime-pouchdb": "0.19.3",
     "debug": "2.6.2",

diff --git a/packages/composer-runtime-hlfv1/package.json b/packages/composer-runtime-hlfv1/package.json
@@ -42,7 +42,8 @@
     "license-check-and-add": "2.3.1",
     "mocha": "3.4.2",
     "nyc": "11.1.0",
-    "sinon": "2.3.8"
+    "sinon": "2.3.8",
+    "composer-common": "0.19.3"
   },
   "license-check-and-add-config": {
     "folder": ".",
@@ -87,8 +88,10 @@
       }
     }
   },
+  "peerDependencies": {
+    "composer-common": "0.19.3"
+  },
   "dependencies": {
-    "composer-common": "0.19.3",
     "composer-runtime": "0.19.3",
     "fabric-shim": "1.1.0",
     "jsrsasign": "8.0.3",

diff --git a/packages/composer-runtime/package.json b/packages/composer-runtime/package.json
@@ -45,7 +45,8 @@
     "mocha": "3.4.2",
     "nyc": "11.1.0",
     "sinon": "2.3.8",
-    "uglifyify": "3.0.4"
+    "uglifyify": "3.0.4",
+    "composer-common": "0.19.3"
   },
   "license-check-and-add-config": {
     "folder": ".",
@@ -83,8 +84,11 @@
       }
     }
   },
+  "peerDependencies": {
+    "composer-common": "0.19.3"
+  },
   "dependencies": {
-    "composer-common": "0.19.3",
+    "debug": "2.6.2",
     "fast-json-patch": "1.1.8",
     "request": "2.81.0",
     "request-promise-any": "1.0.5",

diff --git a/packages/composer-tests-integration/package.json b/packages/composer-tests-integration/package.json
@@ -13,9 +13,9 @@
     "postlicchk": "npm run lint",
     "lint": "eslint .",
     "test": "exit 0",
-    "test-tagged": "cucumber-js --tags @cli-generate",
-    "test-inner": "cucumber-js --tags 'not @cli-report'",
-    "test-inner-nohsm": "cucumber-js --tags 'not @hsm'",
+    "test-tagged": "cucumber-js --fail-fast --tags @cli-generate",
+    "test-inner": "cucumber-js  --fail-fast --tags 'not @cli-report'",
+    "test-inner-nohsm": "cucumber-js --fail-fast --tags 'not @hsm'",
     "setup": "npm run pretest && npm run lint && npm run start_verdaccio && node ./scripts/npm_serve",
     "int-test": "npm run setup && npm run test-inner && npm run stop_verdaccio",
     "int-test-nohsm": "npm run setup && npm run test-inner-nohsm && npm run stop_verdaccio"

diff --git a/packages/composer-tests-integration/scripts/run-integration-tests.sh b/packages/composer-tests-integration/scripts/run-integration-tests.sh
@@ -50,6 +50,10 @@ rm -rf ./tutorial-network      # business network created from generator in dev
 rm -f ./networkadmin.card
 rm -f ./composer-report-*
 
+# remove anything already there
+docker kill $(docker ps -q) && docker rm $(docker ps -qa) --force
+
+
 rm -rf ${HOME}/.npmrc
 if [ "${DOCKER_FILE}" != "" ]; then
     cd ../composer-runtime-hlfv1

diff --git a/packages/composer-wallet-filesystem/package.json b/packages/composer-wallet-filesystem/package.json
@@ -76,8 +76,10 @@
       }
     }
   },
+  "peerDependencies": {
+    "composer-common": "0.19.3"
+  },
   "dependencies": {
-    "composer-common": "0.19.3",
     "mkdirp": "0.5.1",
     "rimraf": "2.5.4"
   },

diff --git a/packages/composer-wallet-inmemory/package.json b/packages/composer-wallet-inmemory/package.json
@@ -76,10 +76,10 @@
       }
     }
   },
+  "peerDependencies": {
+    "composer-common": "0.19.3"
+  },
   "dependencies": {
-    "composer-common": "0.19.3",
-    "mkdirp": "0.5.1",
-    "rimraf": "2.5.4"
   },
   "nyc": {
     "exclude": [