diff --git a/js/embed/soljson_interface.js b/js/embed/soljson_interface.js index b053d49..bc2c707 100644 --- a/js/embed/soljson_interface.js +++ b/js/embed/soljson_interface.js @@ -1,11 +1,11 @@ mergeInto(LibraryManager.library, { soljson_compile: function(inputPtr, inputLen) { const inputJson = UTF8ToString(inputPtr, inputLen); - const output = Module.solc.compile(inputJson) + var output = Module.soljson.cwrap('solidity_compile', 'string', ['string'])(inputJson); return stringToNewUTF8(output) }, soljson_version: function() { - var version = Module.solc.version(); + var version = Module.soljson.cwrap("solidity_version", "string", [])(); return stringToNewUTF8(version) }, resolc_compile: function(inputPtr, inputLen) { diff --git a/js/rollup.config.js b/js/rollup.config.js index 60bf31c..399d2f1 100644 --- a/js/rollup.config.js +++ b/js/rollup.config.js @@ -1,6 +1,5 @@ const babel = require('@rollup/plugin-babel'); const copy = require('rollup-plugin-copy'); -const resolve = require('@rollup/plugin-node-resolve'); // Add this if resolve is not already imported const outputDirCJS = 'dist/revive-cjs'; const outputDirESM = 'dist/revive-esm'; @@ -24,7 +23,6 @@ module.exports = { presets: ['@babel/preset-env'], babelHelpers: 'inline', }), - resolve(), copy({ targets: [ { src: 'src/resolc.wasm', dest: outputDirCJS }, diff --git a/js/run_revive.js b/js/run_revive.js index a4cbc85..9c1c32d 100644 --- a/js/run_revive.js +++ b/js/run_revive.js @@ -1,4 +1,4 @@ -const solc = require('solc'); +const soljson = require('solc/soljson'); const createRevive = require('./dist/revive-cjs/resolc.js'); const compilerStandardJsonInput = { @@ -31,7 +31,7 @@ const compilerStandardJsonInput = { async function runCompiler() { const m = createRevive(); - m.solc = solc; + m.soljson = soljson; // Set input data for stdin m.setStdinData(JSON.stringify(compilerStandardJsonInput));