diff --git a/integration/config.ts b/integration/config.ts index ee6d5d3..d01da08 100644 --- a/integration/config.ts +++ b/integration/config.ts @@ -1,5 +1,5 @@ -import HDWalletProvider from '@truffle/hdwallet-provider' import { Config } from '../src' +const HDWalletProvider = require('@truffle/hdwallet-provider') const configJson: Config = { nodeUri: 'http://localhost:8545', diff --git a/integration/tsconfig.json b/integration/tsconfig.json index 68cc3b6..c94dc11 100644 --- a/integration/tsconfig.json +++ b/integration/tsconfig.json @@ -2,7 +2,6 @@ "compilerOptions": { "resolveJsonModule": true, "lib": ["es6", "es7", "dom"], - "noUnusedLocals": true, - "esModuleInterop": true + "noUnusedLocals": true } } diff --git a/package.json b/package.json index 644459a..621b470 100644 --- a/package.json +++ b/package.json @@ -115,15 +115,13 @@ }, "release-it": { "hooks": { - "before:init": "npm run doc:json", - "after:bump": "npm run changelog" + "after:bump": "npm run changelog && npm run doc:json" }, "plugins": { "@release-it/bumper": { "out": [ "package.json", - "package-lock.json", - "dist/squid-js.json" + "package-lock.json" ] } }, diff --git a/src/Instantiable.abstract.ts b/src/Instantiable.abstract.ts index d747b0f..3171831 100644 --- a/src/Instantiable.abstract.ts +++ b/src/Instantiable.abstract.ts @@ -1,4 +1,4 @@ -import Web3 from 'web3' +import * as Web3 from 'web3' import Config from './models/Config' import { Logger, LoggerInstance, LogLevel } from './utils' import Web3Provider from './keeper/Web3Provider' diff --git a/src/ddo/DDO.ts b/src/ddo/DDO.ts index 090cd4a..6baf9a2 100644 --- a/src/ddo/DDO.ts +++ b/src/ddo/DDO.ts @@ -1,4 +1,4 @@ -import Web3 from 'web3' +import * as Web3 from 'web3' import Web3Provider from '../keeper/Web3Provider' import LoggerInstance from '../utils/Logger' import { Ocean } from '../ocean/Ocean' diff --git a/src/keeper/Web3Provider.ts b/src/keeper/Web3Provider.ts index faf7ad7..a5b7daa 100644 --- a/src/keeper/Web3Provider.ts +++ b/src/keeper/Web3Provider.ts @@ -1,4 +1,4 @@ -import Web3 from 'web3' +import * as Web3 from 'web3' import Config from '../models/Config' export default class Web3Provider { diff --git a/test/Squid.test.ts b/test/Squid.test.ts index b82ee4d..cb8ac0d 100644 --- a/test/Squid.test.ts +++ b/test/Squid.test.ts @@ -1,4 +1,4 @@ -import assert from 'assert' +import * as assert from 'assert' import * as squid from '../src/squid' describe('Squid', () => { diff --git a/test/aquarius/Aquarius.test.ts b/test/aquarius/Aquarius.test.ts index 3e2e7f8..5723f2c 100644 --- a/test/aquarius/Aquarius.test.ts +++ b/test/aquarius/Aquarius.test.ts @@ -1,5 +1,5 @@ import { assert, spy, use } from 'chai' -import spies from 'chai-spies' +import * as spies from 'chai-spies' import { Ocean } from '../../src/ocean/Ocean' import { Aquarius, SearchQuery } from '../../src/aquarius/Aquarius' import { DDO } from '../../src/ddo/DDO' diff --git a/test/ddo/DDO.test.ts b/test/ddo/DDO.test.ts index 6327fa3..0a35b82 100644 --- a/test/ddo/DDO.test.ts +++ b/test/ddo/DDO.test.ts @@ -1,6 +1,6 @@ import { assert, expect, spy, use } from 'chai' -import spies from 'chai-spies' -import Web3 from 'web3' +import * as spies from 'chai-spies' +import * as Web3 from 'web3' import { DDO } from '../../src/ddo/DDO' import { Service } from '../../src/ddo/Service' diff --git a/test/keeper/EventHandler.test.ts b/test/keeper/EventHandler.test.ts index b9d429f..47bc21a 100644 --- a/test/keeper/EventHandler.test.ts +++ b/test/keeper/EventHandler.test.ts @@ -1,5 +1,5 @@ import { assert, expect, spy, use } from 'chai' -import spies from 'chai-spies' +import * as spies from 'chai-spies' import { EventHandler } from '../../src/keeper/EventHandler' import { Ocean } from '../../src/ocean/Ocean' import config from '../config' diff --git a/test/ocean/DID.test.ts b/test/ocean/DID.test.ts index a75f6b8..c391973 100644 --- a/test/ocean/DID.test.ts +++ b/test/ocean/DID.test.ts @@ -1,4 +1,4 @@ -import assert from 'assert' +import * as assert from 'assert' import DID from '../../src/ocean/DID' describe('DID', () => { diff --git a/test/ocean/Ocean.test.ts b/test/ocean/Ocean.test.ts index ce32172..456676a 100644 --- a/test/ocean/Ocean.test.ts +++ b/test/ocean/Ocean.test.ts @@ -1,5 +1,5 @@ import { assert, spy, use } from 'chai' -import spies from 'chai-spies' +import * as spies from 'chai-spies' import { SearchQuery } from '../../src/aquarius/Aquarius' import Account from '../../src/ocean/Account' diff --git a/test/ocean/OceanAccounts.test.ts b/test/ocean/OceanAccounts.test.ts index ba68775..f403286 100644 --- a/test/ocean/OceanAccounts.test.ts +++ b/test/ocean/OceanAccounts.test.ts @@ -1,5 +1,5 @@ import { assert, spy, use } from 'chai' -import spies from 'chai-spies' +import * as spies from 'chai-spies' import config from '../config' import Account from '../../src/ocean/Account' diff --git a/test/ocean/OceanAuth.test.ts b/test/ocean/OceanAuth.test.ts index 23bdaf7..5f07e78 100644 --- a/test/ocean/OceanAuth.test.ts +++ b/test/ocean/OceanAuth.test.ts @@ -1,5 +1,5 @@ import { assert, expect, spy, use } from 'chai' -import spies from 'chai-spies' +import * as spies from 'chai-spies' import config from '../config' import Account from '../../src/ocean/Account' diff --git a/test/ocean/OceanSecretStore.test.ts b/test/ocean/OceanSecretStore.test.ts index fcbb4c0..b6d02d7 100644 --- a/test/ocean/OceanSecretStore.test.ts +++ b/test/ocean/OceanSecretStore.test.ts @@ -1,5 +1,5 @@ import { assert, expect, spy, use } from 'chai' -import spies from 'chai-spies' +import * as spies from 'chai-spies' import Account from '../../src/ocean/Account' import { Ocean } from '../../src/ocean/Ocean' diff --git a/test/ocean/utils/SignatureUtils.test.ts b/test/ocean/utils/SignatureUtils.test.ts index 86f65ef..3751e36 100644 --- a/test/ocean/utils/SignatureUtils.test.ts +++ b/test/ocean/utils/SignatureUtils.test.ts @@ -1,5 +1,5 @@ import { assert, expect, spy, use } from 'chai' -import spies from 'chai-spies' +import * as spies from 'chai-spies' import config from '../../config' diff --git a/test/tsconfig.json b/test/tsconfig.json index 14083c9..f38bc65 100644 --- a/test/tsconfig.json +++ b/test/tsconfig.json @@ -2,7 +2,6 @@ "compilerOptions": { "resolveJsonModule": true, "lib": ["es6", "es7"], - "noUnusedLocals": true, - "esModuleInterop": true + "noUnusedLocals": true } } diff --git a/test/utils/SubscribableObserver.test.ts b/test/utils/SubscribableObserver.test.ts index 592b3c3..97c52f4 100644 --- a/test/utils/SubscribableObserver.test.ts +++ b/test/utils/SubscribableObserver.test.ts @@ -1,5 +1,5 @@ import { assert, expect, spy, use } from 'chai' -import spies from 'chai-spies' +import * as spies from 'chai-spies' import { SubscribableObserver } from '../../src/utils/SubscribableObserver' diff --git a/test/utils/SubscribablePromise.test.ts b/test/utils/SubscribablePromise.test.ts index ad7a4f8..82778d6 100644 --- a/test/utils/SubscribablePromise.test.ts +++ b/test/utils/SubscribablePromise.test.ts @@ -1,5 +1,5 @@ import { assert, expect, spy, use } from 'chai' -import spies from 'chai-spies' +import * as spies from 'chai-spies' import { SubscribablePromise } from '../../src/utils/SubscribablePromise' diff --git a/tsconfig.json b/tsconfig.json index 5c73cea..e81d391 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,7 +6,6 @@ "declaration": true, "module": "commonjs", "target": "es5", - "esModuleInterop": true, "noImplicitAny": false, "removeComments": true, "experimentalDecorators": true,