Merge pull request #595 from stephensli/fix/commonjs-default-exporting

fix: use esModuleInterop to resolve commonjs default require

Author: chriseth

abi.ts

@@ -58,6 +58,6 @@ function update (compilerVersion, abi) {
   return abi;
 }
 
-export default {
+export = {
   update
 };

downloadCurrentVersion.ts

@@ -3,11 +3,11 @@
 // This is used to download the correct binary version
 // as part of the prepublish step.
 
-import * as pkg from './package.json';
 import * as fs from 'fs';
 import { https } from 'follow-redirects';
-import * as MemoryStream from 'memorystream';
+import MemoryStream from 'memorystream';
 import { keccak256 } from 'js-sha3';
+const pkg = require('./package.json');
 
 function getVersionList (cb) {
   console.log('Retrieving available version list...');

index.ts

@@ -1,26 +1,4 @@
 import wrapper from './wrapper';
 
 const soljson = require('./soljson.js');
-const wrapped = wrapper(soljson);
-
-const {
-  version,
-  semver,
-  license,
-  lowlevel,
-  features,
-  compile,
-  loadRemoteVersion,
-  setupMethods
-} = wrapped;
-
-export {
-  version,
-  semver,
-  license,
-  lowlevel,
-  features,
-  compile,
-  loadRemoteVersion,
-  setupMethods
-};
+export = wrapper(soljson);

linker.ts

@@ -1,4 +1,4 @@
-import * as assert from 'assert';
+import assert from 'assert';
 import { keccak256 } from 'js-sha3';
 
 function libraryHashPlaceholder (input) {
@@ -88,7 +88,7 @@ const findLinkReferences = function (bytecode) {
   return linkReferences;
 };
 
-export default {
+export = {
   linkBytecode,
   findLinkReferences
 };

smtchecker.ts

@@ -36,7 +36,7 @@ function smtCallback (solverFunction, solver?: any) {
   };
 }
 
-export default {
+export = {
   handleSMTQueries,
   smtCallback
 };

smtsolver.ts

@@ -67,7 +67,7 @@ function solve (query, solver) {
   return solverOutput;
 }
 
-export default {
+export = {
   smtSolver: solve,
   availableSolvers: solvers
 };

solc.ts

@@ -4,7 +4,7 @@ import * as commander from 'commander';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-import * as solc from './index';
+import solc from './index';
 import smtchecker from './smtchecker';
 import smtsolver from './smtsolver';
 

test/abi.ts

@@ -1,4 +1,4 @@
-import * as tape from 'tape';
+import tape from 'tape';
 import abi from '../abi';
 
 tape('ABI translator', function (t) {

test/cli.ts

@@ -1,7 +1,7 @@
-import * as tape from 'tape';
-import * as spawn from 'tape-spawn';
+import tape from 'tape';
+import spawn from 'tape-spawn';
 import * as path from 'path';
-import * as pkg from '../package.json';
+const pkg = require('../package.json');
 
 tape('CLI', function (t) {
   t.test('--version', function (st) {

test/compiler.ts

@@ -1,7 +1,7 @@
-import * as assert from 'assert';
-import * as tape from 'tape';
+import assert from 'assert';
+import tape from 'tape';
 import * as semver from 'semver';
-import * as solc from '../';
+import solc from '../';
 import linker from '../linker';
 import { execSync } from 'child_process';
 import wrapper from '../wrapper';