fix(Concerto) Switch to Concerto 0.81 with ergo serializer, remove Co…

…ncerto hack Signed-off-by: Jerome Simeon <[email protected]>
jeromesimeon · Oct 6, 2019 · 698f739 · 698f739
1 parent f743a23
commit 698f739
Show file tree

Hide file tree

Showing 16 changed files with 885 additions and 5,445 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/ergo-compiler/index.js b/packages/ergo-compiler/index.js
@@ -19,14 +19,11 @@
  * @module ergo-compiler
  */
 
-module.exports.ComposerConcerto = require('@accordproject/concerto');
-module.exports.ComposerConcertoTools = require('@accordproject/concerto-tools');
-
 module.exports.APModelManager = require('./lib/apmodelmanager.js');
 module.exports.Compiler = require('./lib/compiler.js');
 module.exports.CompilerException = require('./lib/compilerexception.js');
 module.exports.LogicManager = require('./lib/logicmanager.js');
-module.exports.Logger = require('@accordproject/markdown-common').Logger;
+module.exports.Logger = require('@accordproject/concerto-core').Logger;
 module.exports.ScriptManager = require('./lib/scriptmanager.js');
 module.exports.TypeException = require('./lib/typeexception.js');
 module.exports.Util = require('./lib/util.js');

diff --git a/packages/ergo-compiler/lib/apmodelmanager.js b/packages/ergo-compiler/lib/apmodelmanager.js
@@ -16,7 +16,7 @@
 
 const fsPath = require('path');
 
-const ModelManager = require('@accordproject/concerto').ModelManager;
+const ModelManager = require('@accordproject/concerto-core').ModelManager;
 const Builtin = require('./builtin');
 
 /**

diff --git a/packages/ergo-compiler/lib/compiler.js b/packages/ergo-compiler/lib/compiler.js
@@ -15,8 +15,8 @@
 'use strict';
 
 const CompilerCore=require('../extracted/compilercore');
-const CTOParser = require('@accordproject/concerto/lib/introspect/parser');
-const Logger = require('@accordproject/markdown-common').Logger;
+const CTOParser = require('@accordproject/concerto-core/lib/introspect/parser');
+const Logger = require('@accordproject/concerto-core').Logger;
 
 /**
  * <p>

diff --git a/packages/ergo-compiler/lib/compilerexception.js b/packages/ergo-compiler/lib/compilerexception.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-const BaseFileException = require('@accordproject/concerto').BaseFileException;
+const BaseFileException = require('@accordproject/concerto-core').BaseFileException;
 
 /**
  * Exception throws when ergo compilation fails

diff --git a/packages/ergo-compiler/lib/ergojsongenerator.js b/packages/ergo-compiler/lib/ergojsongenerator.js