Merge pull request #14 from sstone1/master

Move to latest Lerna and enable hoist mode
hyperledger-archives · Mar 15, 2017 · ec6bafd · ec6bafd
2 parents 4be816f + 2e3c066
commit ec6bafd
Show file tree

Hide file tree

Showing 16 changed files with 54 additions and 45 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,9 @@
 {
-  "lerna": "2.0.0-beta.32",
+  "lerna": "2.0.0-beta.38",
   "packages": [
     "packages/*"
   ],
-  "version": "0.0.2"
+  "version": "0.0.2",
+  "hoist": true,
+  "nohoist": "*-model"
 }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "devDependencies": {
     "colors": "^1.1.2",
-    "lerna": "2.0.0-beta.32",
+    "lerna": "2.0.0-beta.38",
     "moment": "^2.17.1",
     "semver": "^5.3.0",
     "sleep-promise": "^2.0.0"
@@ -31,4 +31,4 @@
   ],
   "author": "Fabric Composer",
   "license": "Apache-2.0"
-}
+}
diff --git a/packages/animaltracking-network/jsdoc.conf b/packages/animaltracking-network/jsdoc.conf
@@ -4,10 +4,12 @@
         "dictionaries": ["jsdoc","closure"]
     },
     "source": {
-        "includePattern": ".+\\.js(doc|x)?$",
-        "excludePattern": "(^|\\/|\\\\)_|(chaincode|node_modules|out|scripts).+"
+        "include": [
+            "./lib"
+        ],
+        "includePattern": ".+\\.js(doc|x)?$"
     },
-    "plugins": [],
+    "plugins": ["plugins/markdown"],
     "templates": {
       "logoFile": "",
       "cleverLinks": false,

diff --git a/packages/animaltracking-network/package.json b/packages/animaltracking-network/package.json
@@ -9,7 +9,7 @@
     "postlint": "npm run licchk",
     "licchk": "license-check",
     "postlicchk": "npm run doc",
-    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf -t ./node_modules/ink-docstrap/template .",
+    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf .",
     "pkgstamp": "node ./scripts/pkgstamp.js"
   },
   "repository": {
@@ -28,7 +28,6 @@
   "devDependencies": {
     "composer-cli": "latest",
     "eslint": "^3.6.1",
-    "ink-docstrap": "^1.3.0",
     "jsdoc": "^3.4.1",
     "license-check": "^1.1.5"
   },

diff --git a/packages/bond-network/jsdoc.conf b/packages/bond-network/jsdoc.conf
@@ -4,18 +4,20 @@
         "dictionaries": ["jsdoc","closure"]
     },
     "source": {
-        "includePattern": ".+\\.js(doc|x)?$",
-        "excludePattern": "(^|\\/|\\\\)_|(chaincode|node_modules|out|scripts).+"
+        "include": [
+            "./lib"
+        ],
+        "includePattern": ".+\\.js(doc|x)?$"
     },
-    "plugins": [],
+    "plugins": ["plugins/markdown"],
     "templates": {
       "logoFile": "",
       "cleverLinks": false,
       "monospaceLinks": false,
       "dateFormat": "ddd MMM Do YYYY",
       "outputSourceFiles": true,
       "outputSourcePath": true,
-      "systemName": "Animal Tracking Network",
+      "systemName": "Financial Bond Network",
       "footer": "",
       "copyright": "Copyright IBM Corp. 2016",
       "navType": "vertical",

diff --git a/packages/bond-network/package.json b/packages/bond-network/package.json
@@ -9,7 +9,7 @@
     "postlint": "npm run licchk",
     "licchk": "license-check",
     "postlicchk": "npm run doc",
-    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf -t ./node_modules/ink-docstrap/template .",
+    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf .",
     "test": "mocha --recursive",
     "deploy": "./scripts/deploy.sh"
   },
@@ -31,7 +31,6 @@
     "composer-connector-embedded": "latest",
     "chai": "^3.5.0",
     "eslint": "^3.6.1",
-    "ink-docstrap": "^1.3.0",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.4.1",
     "license-check": "^1.1.5",

diff --git a/packages/carauction-network/jsdoc.conf b/packages/carauction-network/jsdoc.conf
@@ -4,18 +4,20 @@
         "dictionaries": ["jsdoc","closure"]
     },
     "source": {
-        "includePattern": ".+\\.js(doc|x)?$",
-        "excludePattern": "(^|\\/|\\\\)_|(chaincode|node_modules|out|scripts).+"
+        "include": [
+            "./lib"
+        ],
+        "includePattern": ".+\\.js(doc|x)?$"
     },
-    "plugins": [],
+    "plugins": ["plugins/markdown"],
     "templates": {
       "logoFile": "",
       "cleverLinks": false,
       "monospaceLinks": false,
       "dateFormat": "ddd MMM Do YYYY",
       "outputSourceFiles": true,
       "outputSourcePath": true,
-      "systemName": "Animal Tracking Network",
+      "systemName": "Car Auction Network",
       "footer": "",
       "copyright": "Copyright IBM Corp. 2016",
       "navType": "vertical",

diff --git a/packages/carauction-network/package.json b/packages/carauction-network/package.json
@@ -9,7 +9,7 @@
     "postlint": "npm run licchk",
     "licchk": "license-check",
     "postlicchk": "npm run doc",
-    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf -t ./node_modules/ink-docstrap/template .",
+    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf .",
     "test": "mocha --recursive",
     "deploy": "./scripts/deploy.sh"
   },
@@ -30,7 +30,6 @@
     "composer-connector-embedded": "latest",
     "chai": "^3.5.0",
     "eslint": "^3.6.1",
-    "ink-docstrap": "^1.3.0",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.4.1",
     "license-check": "^1.1.5",

diff --git a/packages/digitalproperty-network/jsdoc.conf b/packages/digitalproperty-network/jsdoc.conf
@@ -4,18 +4,20 @@
         "dictionaries": ["jsdoc","closure"]
     },
     "source": {
-        "includePattern": ".+\\.js(doc|x)?$",
-        "excludePattern": "(^|\\/|\\\\)_|(chaincode|node_modules|out|scripts).+"
+        "include": [
+            "./lib"
+        ],
+        "includePattern": ".+\\.js(doc|x)?$"
     },
-    "plugins": [],
+    "plugins": ["plugins/markdown"],
     "templates": {
       "logoFile": "",
       "cleverLinks": false,
       "monospaceLinks": false,
       "dateFormat": "ddd MMM Do YYYY",
       "outputSourceFiles": true,
       "outputSourcePath": true,
-      "systemName": "Animal Tracking Network",
+      "systemName": "Digital Property Network",
       "footer": "",
       "copyright": "Copyright IBM Corp. 2016",
       "navType": "vertical",

diff --git a/packages/digitalproperty-network/package.json b/packages/digitalproperty-network/package.json
@@ -9,7 +9,7 @@
     "postlint": "npm run licchk",
     "licchk": "license-check",
     "postlicchk": "npm run doc",
-    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf -t ./node_modules/ink-docstrap/template .",
+    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf .",
     "test": "mocha --recursive",
     "deploy": "./scripts/deploy.sh"
   },
@@ -29,7 +29,6 @@
     "composer-connector-embedded": "latest",
     "chai": "^3.5.0",
     "eslint": "^3.6.1",
-    "ink-docstrap": "^1.3.0",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.4.1",
     "license-check": "^1.1.5",

diff --git a/packages/marbles-network/jsdoc.conf b/packages/marbles-network/jsdoc.conf
@@ -4,18 +4,20 @@
         "dictionaries": ["jsdoc","closure"]
     },
     "source": {
-        "includePattern": ".+\\.js(doc|x)?$",
-        "excludePattern": "(^|\\/|\\\\)_|(chaincode|node_modules|out|scripts).+"
+        "include": [
+            "./lib"
+        ],
+        "includePattern": ".+\\.js(doc|x)?$"
     },
-    "plugins": [],
+    "plugins": ["plugins/markdown"],
     "templates": {
       "logoFile": "",
       "cleverLinks": false,
       "monospaceLinks": false,
       "dateFormat": "ddd MMM Do YYYY",
       "outputSourceFiles": true,
       "outputSourcePath": true,
-      "systemName": "Animal Tracking Network",
+      "systemName": "Marble Trading Network",
       "footer": "",
       "copyright": "Copyright IBM Corp. 2016",
       "navType": "vertical",

diff --git a/packages/marbles-network/package.json b/packages/marbles-network/package.json
@@ -9,7 +9,7 @@
     "postlint": "npm run licchk",
     "licchk": "license-check",
     "postlicchk": "npm run doc",
-    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf -t ./node_modules/ink-docstrap/template .",
+    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf .",
     "test": "mocha --recursive",
     "deploy": "./scripts/deploy.sh"
   },
@@ -31,7 +31,6 @@
     "composer-connector-embedded": "latest",
     "chai": "^3.5.0",
     "eslint": "^3.6.1",
-    "ink-docstrap": "^1.3.0",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.4.1",
     "license-check": "^1.1.5",

diff --git a/packages/perishable-network/jsdoc.conf b/packages/perishable-network/jsdoc.conf
@@ -4,18 +4,20 @@
         "dictionaries": ["jsdoc","closure"]
     },
     "source": {
-        "includePattern": ".+\\.js(doc|x)?$",
-        "excludePattern": "(^|\\/|\\\\)_|(chaincode|node_modules|out|scripts).+"
+        "include": [
+            "./lib"
+        ],
+        "includePattern": ".+\\.js(doc|x)?$"
     },
-    "plugins": [],
+    "plugins": ["plugins/markdown"],
     "templates": {
       "logoFile": "",
       "cleverLinks": false,
       "monospaceLinks": false,
       "dateFormat": "ddd MMM Do YYYY",
       "outputSourceFiles": true,
       "outputSourcePath": true,
-      "systemName": "Animal Tracking Network",
+      "systemName": "Perishable Goods Network",
       "footer": "",
       "copyright": "Copyright IBM Corp. 2016",
       "navType": "vertical",

diff --git a/packages/perishable-network/package.json b/packages/perishable-network/package.json
@@ -9,7 +9,7 @@
     "postlint": "npm run licchk",
     "licchk": "license-check",
     "postlicchk": "npm run doc",
-    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf -t ./node_modules/ink-docstrap/template .",
+    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf .",
     "test": "mocha --recursive",
     "deploy": "./scripts/deploy.sh"
   },
@@ -32,7 +32,6 @@
     "composer-connector-embedded": "latest",
     "chai": "^3.5.0",
     "eslint": "^3.6.1",
-    "ink-docstrap": "^1.3.0",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.4.1",
     "license-check": "^1.1.5",

diff --git a/packages/sample-network/jsdoc.conf b/packages/sample-network/jsdoc.conf
@@ -4,18 +4,20 @@
         "dictionaries": ["jsdoc","closure"]
     },
     "source": {
-        "includePattern": ".+\\.js(doc|x)?$",
-        "excludePattern": "(^|\\/|\\\\)_|(chaincode|node_modules|out|scripts).+"
+        "include": [
+            "./lib"
+        ],
+        "includePattern": ".+\\.js(doc|x)?$"
     },
-    "plugins": [],
+    "plugins": ["plugins/markdown"],
     "templates": {
       "logoFile": "",
       "cleverLinks": false,
       "monospaceLinks": false,
       "dateFormat": "ddd MMM Do YYYY",
       "outputSourceFiles": true,
       "outputSourcePath": true,
-      "systemName": "Animal Tracking Network",
+      "systemName": "Sample Network",
       "footer": "",
       "copyright": "Copyright IBM Corp. 2016",
       "navType": "vertical",

diff --git a/packages/sample-network/package.json b/packages/sample-network/package.json
@@ -9,7 +9,7 @@
     "postlint": "npm run licchk",
     "licchk": "license-check",
     "postlicchk": "npm run doc",
-    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf -t ./node_modules/ink-docstrap/template .",
+    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf .",
     "test": "mocha --recursive",
     "deploy": "./scripts/deploy.sh"
   },
@@ -30,7 +30,6 @@
     "composer-connector-embedded": "latest",
     "chai": "^3.5.0",
     "eslint": "^3.6.1",
-    "ink-docstrap": "^1.3.0",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.4.1",
     "license-check": "^1.1.5",