diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-02-10 06:39:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-10 06:39:05 +0800 |
| commit | efb6eb28ce072aab0f3bca69d833d20fdef23ea2 (patch) | |
| tree | 952eab52d555ab8b9cbe7479af926de5a9713693 /packages/deployer/src | |
| parent | 2e3c9b87df9b8a0b99533e89ce3442b5f4fec5df (diff) | |
| parent | ac5531ce850c5ab6f55b8c4733a6909643572508 (diff) | |
| download | dexon-sol-tools-efb6eb28ce072aab0f3bca69d833d20fdef23ea2.tar dexon-sol-tools-efb6eb28ce072aab0f3bca69d833d20fdef23ea2.tar.gz dexon-sol-tools-efb6eb28ce072aab0f3bca69d833d20fdef23ea2.tar.bz2 dexon-sol-tools-efb6eb28ce072aab0f3bca69d833d20fdef23ea2.tar.lz dexon-sol-tools-efb6eb28ce072aab0f3bca69d833d20fdef23ea2.tar.xz dexon-sol-tools-efb6eb28ce072aab0f3bca69d833d20fdef23ea2.tar.zst dexon-sol-tools-efb6eb28ce072aab0f3bca69d833d20fdef23ea2.zip | |
Merge pull request #389 from 0xProject/fix/npmInclusionIssues
Fix NPM Inclusion Issues
Diffstat (limited to 'packages/deployer/src')
| -rw-r--r-- | packages/deployer/src/commands.ts | 2 | ||||
| -rw-r--r-- | packages/deployer/src/globals.d.ts | 3 | ||||
| -rw-r--r-- | packages/deployer/src/migrations/config/token_info.ts | 2 | ||||
| -rw-r--r-- | packages/deployer/src/migrations/migrate.ts | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/packages/deployer/src/commands.ts b/packages/deployer/src/commands.ts index 2acef8e8f..d1707c5ed 100644 --- a/packages/deployer/src/commands.ts +++ b/packages/deployer/src/commands.ts @@ -1,6 +1,6 @@ -import { migrator } from './migrations/migrate'; import { Compiler } from './compiler'; import { Deployer } from './deployer'; +import { migrator } from './migrations/migrate'; import { CompilerOptions, DeployerOptions } from './utils/types'; export const commands = { diff --git a/packages/deployer/src/globals.d.ts b/packages/deployer/src/globals.d.ts index 0a35002da..2e04d83ea 100644 --- a/packages/deployer/src/globals.d.ts +++ b/packages/deployer/src/globals.d.ts @@ -1,8 +1,11 @@ declare module 'solc' { + // tslint:disable:completed-docs export function compile(sources: any, optimizerEnabled: number, findImports: (importPath: string) => any): any; export function setupMethods(solcBin: any): any; + // tslint:enable:completed-docs } declare module 'web3-eth-abi' { + // tslint:disable-next-line:completed-docs export function encodeParameters(typesArray: string[], parameters: any[]): string; } diff --git a/packages/deployer/src/migrations/config/token_info.ts b/packages/deployer/src/migrations/config/token_info.ts index 7e822fc3b..a815f5801 100644 --- a/packages/deployer/src/migrations/config/token_info.ts +++ b/packages/deployer/src/migrations/config/token_info.ts @@ -1,5 +1,5 @@ -import { constants } from '../../utils/constants'; import { Token } from '../../types'; +import { constants } from '../../utils/constants'; export const tokenInfo: Token[] = [ { diff --git a/packages/deployer/src/migrations/migrate.ts b/packages/deployer/src/migrations/migrate.ts index 393806b45..d3b397f0a 100644 --- a/packages/deployer/src/migrations/migrate.ts +++ b/packages/deployer/src/migrations/migrate.ts @@ -4,6 +4,7 @@ import * as _ from 'lodash'; import { Deployer } from '../deployer'; import { constants } from '../utils/constants'; + import { tokenInfo } from './config/token_info'; export const migrator = { |