From f3f264f5fde609c05641fabb5cc6c2c333e103b4 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 9 Feb 2018 12:50:37 -0800 Subject: Add tslint.json to deployer package and fix all tslint issues --- packages/deployer/package.json | 7 +++++++ packages/deployer/src/commands.ts | 2 +- packages/deployer/src/globals.d.ts | 3 +++ packages/deployer/src/migrations/config/token_info.ts | 2 +- packages/deployer/src/migrations/migrate.ts | 1 + packages/deployer/test/deploy_test.ts | 1 + packages/deployer/tslint.json | 3 +++ 7 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 packages/deployer/tslint.json (limited to 'packages/deployer') diff --git a/packages/deployer/package.json b/packages/deployer/package.json index 6564d89eb..e1e41271c 100644 --- a/packages/deployer/package.json +++ b/packages/deployer/package.json @@ -28,14 +28,21 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/deployer/README.md", "devDependencies": { + "@0xproject/tslint-config": "^0.4.7", + "chai": "^4.0.1", "copyfiles": "^1.2.0", + "mocha": "^4.0.1", + "tslint": "5.8.0", "types-bn": "^0.0.1", "typescript": "2.7.1", "web3-typescript-typings": "^0.9.9" }, "dependencies": { + "@0xproject/json-schemas": "^0.7.9", "@0xproject/utils": "^0.3.1", + "@0xproject/types": "^0.2.0", "@0xproject/web3-wrapper": "^0.1.11", + "ethereumjs-util": "^5.1.1", "lodash": "^4.17.4", "solc": "^0.4.18", "web3": "^0.20.0", 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 = { diff --git a/packages/deployer/test/deploy_test.ts b/packages/deployer/test/deploy_test.ts index 5df729a04..5fe2ffbd7 100644 --- a/packages/deployer/test/deploy_test.ts +++ b/packages/deployer/test/deploy_test.ts @@ -5,6 +5,7 @@ import { Compiler } from '../src/compiler'; import { Deployer } from '../src/deployer'; import { fsWrapper } from '../src/utils/fs_wrapper'; import { CompilerOptions, ContractArtifact, ContractData, DoneCallback } from '../src/utils/types'; + import { constructor_args, exchange_binary } from './fixtures/exchange_bin'; import { constants } from './util/constants'; diff --git a/packages/deployer/tslint.json b/packages/deployer/tslint.json new file mode 100644 index 000000000..ffaefe83a --- /dev/null +++ b/packages/deployer/tslint.json @@ -0,0 +1,3 @@ +{ + "extends": ["@0xproject/tslint-config"] +} -- cgit v1.2.3 From 7e12269baf43de0bdc6fc6ecbad4e5d90ab999d5 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 9 Feb 2018 12:52:12 -0800 Subject: Add npmignore to deployer along with a changelog --- packages/deployer/.npmignore | 4 ++++ packages/deployer/CHANGELOG.md | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 packages/deployer/.npmignore create mode 100644 packages/deployer/CHANGELOG.md (limited to 'packages/deployer') diff --git a/packages/deployer/.npmignore b/packages/deployer/.npmignore new file mode 100644 index 000000000..50b874d6e --- /dev/null +++ b/packages/deployer/.npmignore @@ -0,0 +1,4 @@ +/src/ +/scripts/ +test/ +tsconfig.json diff --git a/packages/deployer/CHANGELOG.md b/packages/deployer/CHANGELOG.md new file mode 100644 index 000000000..cbc336c63 --- /dev/null +++ b/packages/deployer/CHANGELOG.md @@ -0,0 +1,5 @@ +# CHANGELOG + +## v0.0.8 - _February 9, 2018_ + + * Fix publishing issue where .npmignore was not properly excluding undesired content -- cgit v1.2.3 From b74ad0ad12b82405ffa96f02510891539704059f Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 9 Feb 2018 13:28:32 -0800 Subject: ignore all files starting with dots in all sub-packages --- packages/deployer/.npmignore | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/deployer') diff --git a/packages/deployer/.npmignore b/packages/deployer/.npmignore index 50b874d6e..f4a7c0beb 100644 --- a/packages/deployer/.npmignore +++ b/packages/deployer/.npmignore @@ -1,3 +1,4 @@ +.* /src/ /scripts/ test/ -- cgit v1.2.3 From 0fd411f83f79414397144f08bdff5c6b195b320c Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 9 Feb 2018 13:31:01 -0800 Subject: Add PR number to CHANGELOGs --- packages/deployer/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/deployer') diff --git a/packages/deployer/CHANGELOG.md b/packages/deployer/CHANGELOG.md index cbc336c63..ad8c64538 100644 --- a/packages/deployer/CHANGELOG.md +++ b/packages/deployer/CHANGELOG.md @@ -2,4 +2,4 @@ ## v0.0.8 - _February 9, 2018_ - * Fix publishing issue where .npmignore was not properly excluding undesired content + * Fix publishing issue where .npmignore was not properly excluding undesired content (#389) -- cgit v1.2.3 From bc2415c70e14b11d635b328d89794d27d9b59fe4 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 9 Feb 2018 14:03:08 -0800 Subject: Add `yarn-error.log` to all .npmignore --- packages/deployer/.npmignore | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/deployer') diff --git a/packages/deployer/.npmignore b/packages/deployer/.npmignore index f4a7c0beb..05fa23a59 100644 --- a/packages/deployer/.npmignore +++ b/packages/deployer/.npmignore @@ -1,4 +1,5 @@ .* +yarn-error.log /src/ /scripts/ test/ -- cgit v1.2.3