From ca25b816fabe15ce1ebc539c0316beba813683b8 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 13 Mar 2018 15:29:12 +0100 Subject: move scripts to monorepro-scripts --- packages/deployer/package.json | 5 +++-- packages/deployer/scripts/postpublish.js | 5 ----- packages/deployer/src/globals.d.ts | 7 +++++++ packages/deployer/src/monorepo_scripts/postpublish.ts | 6 ++++++ 4 files changed, 16 insertions(+), 7 deletions(-) delete mode 100644 packages/deployer/scripts/postpublish.js create mode 100644 packages/deployer/src/monorepo_scripts/postpublish.ts (limited to 'packages/deployer') diff --git a/packages/deployer/package.json b/packages/deployer/package.json index a705f1ac0..650997e78 100644 --- a/packages/deployer/package.json +++ b/packages/deployer/package.json @@ -6,10 +6,10 @@ "types": "lib/src/index.d.ts", "scripts": { "build:watch": "tsc -w", - "build": "yarn clean && copyfiles 'test/fixtures/contracts/**/*' src/solc/solc_bin/* ./lib && tsc", + "build": "yarn clean && copyfiles 'test/fixtures/contracts/**/*' src/solc/solc_bin/* ./lib && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "test": "npm run build; mocha lib/test/*_test.js", "compile": "npm run build; node lib/src/cli.js compile", - "clean": "shx rm -rf ./lib", + "clean": "shx rm -rf lib scripts", "migrate": "npm run build; node lib/src/cli.js migrate", "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'", "test:circleci": "yarn test" @@ -28,6 +28,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/deployer/README.md", "devDependencies": { + "@0xproject/monorepo-scripts": "^0.1.12", "@0xproject/tslint-config": "^0.4.10", "chai": "^4.0.1", "copyfiles": "^1.2.0", diff --git a/packages/deployer/scripts/postpublish.js b/packages/deployer/scripts/postpublish.js deleted file mode 100644 index b3e5407c8..000000000 --- a/packages/deployer/scripts/postpublish.js +++ /dev/null @@ -1,5 +0,0 @@ -const postpublish_utils = require('../../../scripts/postpublish_utils'); -const packageJSON = require('../package.json'); - -const subPackageName = packageJSON.name; -postpublish_utils.standardPostPublishAsync(subPackageName); \ No newline at end of file diff --git a/packages/deployer/src/globals.d.ts b/packages/deployer/src/globals.d.ts index 2e04d83ea..ec671ab63 100644 --- a/packages/deployer/src/globals.d.ts +++ b/packages/deployer/src/globals.d.ts @@ -9,3 +9,10 @@ declare module 'web3-eth-abi' { // tslint:disable-next-line:completed-docs export function encodeParameters(typesArray: string[], parameters: any[]): string; } + +declare module '*.json' { + const json: any; + /* tslint:disable */ + export default json; + /* tslint:enable */ +} diff --git a/packages/deployer/src/monorepo_scripts/postpublish.ts b/packages/deployer/src/monorepo_scripts/postpublish.ts new file mode 100644 index 000000000..d5fcff9d0 --- /dev/null +++ b/packages/deployer/src/monorepo_scripts/postpublish.ts @@ -0,0 +1,6 @@ +import { postpublishUtils } from '@0xproject/monorepo-scripts'; + +import * as packageJSON from '../package.json'; + +const subPackageName = (packageJSON as any).name; +postpublishUtils.standardPostPublishAsync(subPackageName); -- cgit v1.2.3 From a2e848a7fafbae4df51de6f05fd53a6abf78a593 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 13 Mar 2018 16:55:50 +0100 Subject: Fix lint issues --- packages/deployer/src/monorepo_scripts/postpublish.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/deployer') diff --git a/packages/deployer/src/monorepo_scripts/postpublish.ts b/packages/deployer/src/monorepo_scripts/postpublish.ts index d5fcff9d0..6e5aa050a 100644 --- a/packages/deployer/src/monorepo_scripts/postpublish.ts +++ b/packages/deployer/src/monorepo_scripts/postpublish.ts @@ -3,4 +3,5 @@ import { postpublishUtils } from '@0xproject/monorepo-scripts'; import * as packageJSON from '../package.json'; const subPackageName = (packageJSON as any).name; +// tslint:disable-next-line:no-floating-promises postpublishUtils.standardPostPublishAsync(subPackageName); -- cgit v1.2.3 From f7c1e10b5ac112866ee55e7fededdb37c890d30f Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 14 Mar 2018 14:07:24 +0100 Subject: Move configuration into package.json configs section --- packages/deployer/src/monorepo_scripts/postpublish.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages/deployer') diff --git a/packages/deployer/src/monorepo_scripts/postpublish.ts b/packages/deployer/src/monorepo_scripts/postpublish.ts index 6e5aa050a..dcb99d0f7 100644 --- a/packages/deployer/src/monorepo_scripts/postpublish.ts +++ b/packages/deployer/src/monorepo_scripts/postpublish.ts @@ -1,7 +1,8 @@ import { postpublishUtils } from '@0xproject/monorepo-scripts'; import * as packageJSON from '../package.json'; +import * as tsConfigJSON from '../tsconfig.json'; -const subPackageName = (packageJSON as any).name; +const cwd = `${__dirname}/..`; // tslint:disable-next-line:no-floating-promises -postpublishUtils.standardPostPublishAsync(subPackageName); +postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd); -- cgit v1.2.3 From 40ebb533b324bf7dd454243fcb1ee092ab85f7eb Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 14 Mar 2018 12:27:09 +0100 Subject: Enable coverage for all other packages with tests --- packages/deployer/coverage/.gitkeep | 0 packages/deployer/package.json | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 packages/deployer/coverage/.gitkeep (limited to 'packages/deployer') diff --git a/packages/deployer/coverage/.gitkeep b/packages/deployer/coverage/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/packages/deployer/package.json b/packages/deployer/package.json index 4bc739841..71fe4d9d7 100644 --- a/packages/deployer/package.json +++ b/packages/deployer/package.json @@ -8,11 +8,13 @@ "build:watch": "tsc -w", "build": "yarn clean && copyfiles 'test/fixtures/contracts/**/*' ./lib && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "test": "npm run build; mocha lib/test/*_test.js", + "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", + "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", "compile": "npm run build; node lib/src/cli.js compile", "clean": "shx rm -rf lib scripts", "migrate": "npm run build; node lib/src/cli.js migrate", "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'", - "test:circleci": "yarn test" + "test:circleci": "yarn test:coverage" }, "bin": { "0x-deployer": "lib/src/cli.js" @@ -33,6 +35,7 @@ "@types/require-from-string": "^1.2.0", "chai": "^4.0.1", "copyfiles": "^1.2.0", + "nyc": "^11.0.1", "ethers-typescript-typings": "^0.0.2", "mocha": "^4.0.1", "shx": "^0.2.2", -- cgit v1.2.3