fix(concerto) Remove Concerto hack, switch to Concerto 0.81, remove logger

Signed-off-by: Jerome Simeon <[email protected]>

Author: jeromesimeon

package-lock.json

@@ -78,6 +78,7 @@
     "webpack-cli": "^3.3.5"
   },
   "dependencies": {
+    "@accordproject/concerto-core": "^0.81.0",
     "@accordproject/markdown-common": "0.4.5",
     "commonmark": "^0.29.0",
     "sax": "^1.2.4",

packages/markdown-cicero/package.json

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const { ModelManager, Factory, Serializer } = require('@accordproject/markdown-common').ComposerConcerto;
+const { ModelManager, Factory, Serializer } = require('@accordproject/concerto-core');
 
 const CommonMarkTransformer = require('@accordproject/markdown-common').CommonMarkTransformer;
 const { commonMarkModel } = require('@accordproject/markdown-common').Models;

packages/markdown-cicero/src/CiceroMarkTransformer.js

@@ -15,7 +15,7 @@
 'use strict';
 
 const Fs = require('fs');
-const Logger = require('@accordproject/markdown-common').Logger;
+const Logger = require('@accordproject/concerto-core').Logger;
 
 const CommonMarkTransformer = require('@accordproject/markdown-common').CommonMarkTransformer;
 const CiceroMarkTransformer = require('@accordproject/markdown-cicero').CiceroMarkTransformer;

packages/markdown-cli/lib/Commands.js

@@ -52,6 +52,7 @@
     "tsd-jsdoc": "^2.3.0"
   },
   "dependencies": {
+    "@accordproject/concerto-core": "^0.81.0",
     "@accordproject/markdown-common": "0.4.5",
     "@accordproject/markdown-cicero": "0.4.5",
     "@accordproject/markdown-slate": "0.4.5",

packages/markdown-cli/package.json

@@ -19,9 +19,6 @@
  * @module markdown-transform
  */
 
-module.exports.ComposerConcerto = require('@accordproject/concerto');
-
-module.exports.Logger = require('./lib/Logger');
 module.exports.Stack = require('./lib/Stack');
 module.exports.Models = require('./lib/Models');
 

packages/markdown-common/index.js

@@ -25,7 +25,7 @@
     "lint": "eslint .",
     "postlint": "npm run licchk",
     "licchk": "license-check",
-    "test": "mocha && jest",
+    "test": "jest",
     "test:cov": "nyc npm run test",
     "jsdoc": "jsdoc -c jsdoc.json package.json",
     "typescript": "jsdoc -t node_modules/tsd-jsdoc/dist -r ./src/",
@@ -77,7 +77,7 @@
     "webpack-cli": "^3.3.5"
   },
   "dependencies": {
-    "@accordproject/concerto": "^0.80.3",
+    "@accordproject/concerto-core": "^0.81.0",
     "commonmark": "^0.29.0",
     "sax": "^1.2.4",
     "winston": "3.2.1",

packages/markdown-common/package.json

@@ -17,7 +17,7 @@
 const commonmark = require('commonmark');
 const sax = require('sax');
 
-const { ModelManager, Factory, Serializer } = require('@accordproject/concerto');
+const { ModelManager, Factory, Serializer } = require('@accordproject/concerto-core');
 
 const Stack = require('./Stack');
 const ToMarkdownStringVisitor = require('./ToMarkdownStringVisitor');