fix(concerto) ensure uniform use of the same concerto dependency thro…

…ugh the various packages Signed-off-by: Jerome Simeon <[email protected]>
accordproject · Sep 12, 2019 · 4fd5222 · 4fd5222
1 parent 3d95abe
commit 4fd5222
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/markdown-cicero/package.json b/packages/markdown-cicero/package.json
@@ -80,7 +80,6 @@
   "dependencies": {
     "@accordproject/markdown-common": "0.2.0",
     "commonmark": "^0.29.0",
-    "composer-concerto": "^0.71.6",
     "sax": "^1.2.4",
     "winston": "3.2.1",
     "xmldom": "^0.1.27"

diff --git a/packages/markdown-cicero/src/CiceroMark.js b/packages/markdown-cicero/src/CiceroMark.js
@@ -14,9 +14,7 @@
 
 'use strict';
 
-const ModelManager = require('composer-concerto').ModelManager;
-const Factory = require('composer-concerto').Factory;
-const Serializer = require('composer-concerto').Serializer;
+const { ModelManager, Factory, Serializer } = require('@accordproject/markdown-common').ComposerConcerto;
 
 const CommonMark = require('@accordproject/markdown-common').CommonMark;
 const { commonmarkModel } = require('@accordproject/markdown-common').Models;

diff --git a/packages/markdown-common/index.js b/packages/markdown-common/index.js
@@ -19,6 +19,8 @@
  * @module markdown-transform
  */
 
+module.exports.ComposerConcerto = require('composer-concerto');
+
 module.exports.Logger = require('./lib/Logger');
 module.exports.Stack = require('./lib/Stack');
 module.exports.Models = require('./lib/Models');

diff --git a/packages/markdown-common/src/CommonMark.js b/packages/markdown-common/src/CommonMark.js
@@ -16,10 +16,8 @@
 
 const commonmark = require('commonmark');
 const sax = require('sax');
-const ModelManager = require('composer-concerto').ModelManager;
-const Factory = require('composer-concerto').Factory;
 
-const Serializer = require('composer-concerto').Serializer;
+const { ModelManager, Factory, Serializer } = require('composer-concerto');
 
 const Stack = require('./Stack');
 const ToStringVisitor = require('./ToStringVisitor');