diff options
author | Brandon Millman <brandon.millman@gmail.com> | 2018-03-15 05:36:04 +0800 |
---|---|---|
committer | Brandon Millman <brandon.millman@gmail.com> | 2018-03-15 05:36:04 +0800 |
commit | 380e51ca505a880e1ac24f46b3ba7e1a736f693e (patch) | |
tree | 95e0311485834d8181171da821f258dd46a2d258 /packages/subproviders | |
parent | 6a8c2cb7172be9b0aadb34904d1d9b3348bed0cc (diff) | |
parent | aea7207b9f9865a279243889a5f9ca1638ddc739 (diff) | |
download | dexon-sol-tools-380e51ca505a880e1ac24f46b3ba7e1a736f693e.tar dexon-sol-tools-380e51ca505a880e1ac24f46b3ba7e1a736f693e.tar.gz dexon-sol-tools-380e51ca505a880e1ac24f46b3ba7e1a736f693e.tar.bz2 dexon-sol-tools-380e51ca505a880e1ac24f46b3ba7e1a736f693e.tar.lz dexon-sol-tools-380e51ca505a880e1ac24f46b3ba7e1a736f693e.tar.xz dexon-sol-tools-380e51ca505a880e1ac24f46b3ba7e1a736f693e.tar.zst dexon-sol-tools-380e51ca505a880e1ac24f46b3ba7e1a736f693e.zip |
Merge branch 'development' into feature/utils/console-log
* development: (25 commits)
Enable coverage for all other packages with tests
Fix parallel coverage results reporting
Fix linter issuesx
Remove outdated comment
Add script copying to build command
Add postpublish script to sol-cov
Move configuration into package.json configs section
Transform input data before encoding for callAsync and getABIEncodedTransactionData
Consolidate docs generation and uploading logic
Use async/await instead of promise syntax
Move changelog entry
remove unneeded include
remove unused dep
Fix lint issues
Re-add linter to monorepo-scripts but with tslint-config dep at earlier version to avoid cyclical dependency
small fixes
move scripts to monorepro-scripts
Fix gitignore
Move abi-gen scripts to src
Add missing dep
...
Diffstat (limited to 'packages/subproviders')
-rw-r--r-- | packages/subproviders/coverage/.gitkeep | 0 | ||||
-rw-r--r-- | packages/subproviders/package.json | 11 | ||||
-rw-r--r-- | packages/subproviders/scripts/postpublish.js | 5 | ||||
-rw-r--r-- | packages/subproviders/src/globals.d.ts | 8 | ||||
-rw-r--r-- | packages/subproviders/src/monorepo_scripts/postpublish.ts | 8 |
5 files changed, 24 insertions, 8 deletions
diff --git a/packages/subproviders/coverage/.gitkeep b/packages/subproviders/coverage/.gitkeep new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/packages/subproviders/coverage/.gitkeep diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 1aaecb082..100ed8f87 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -6,13 +6,15 @@ "license": "Apache-2.0", "scripts": { "build:watch": "tsc -w", - "clean": "shx rm -rf lib", - "build": "tsc", + "clean": "shx rm -rf lib scripts", + "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'", "run_mocha_unit": "mocha lib/test/unit/**/*_test.js --timeout 10000 --bail --exit", "run_mocha_integration": "mocha lib/test/integration/**/*_test.js --timeout 10000 --bail --exit", "test": "npm run test:unit", - "test:circleci": "npm run test:unit", + "test:unit:coverage": "nyc npm run test:unit --all && yarn coverage:report:lcov", + "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", + "test:circleci": "npm run test:unit:coverage", "test:all": "run-s test:unit test:integration", "test:unit": "run-s clean build run_mocha_unit", "test:integration": "run-s clean build run_mocha_integration" @@ -36,15 +38,18 @@ "web3-typescript-typings": "^0.10.0" }, "devDependencies": { + "@0xproject/monorepo-scripts": "^0.1.12", "@0xproject/tslint-config": "^0.4.10", "@0xproject/utils": "^0.4.1", "@types/lodash": "^4.14.86", "@types/mocha": "^2.2.42", "@types/node": "^8.0.53", + "nyc": "^11.0.1", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", "chai-as-promised-typescript-typings": "^0.0.10", "chai-typescript-typings": "^0.0.4", + "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", diff --git a/packages/subproviders/scripts/postpublish.js b/packages/subproviders/scripts/postpublish.js deleted file mode 100644 index b3e5407c8..000000000 --- a/packages/subproviders/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/subproviders/src/globals.d.ts b/packages/subproviders/src/globals.d.ts index 25f7f4483..2c86346f5 100644 --- a/packages/subproviders/src/globals.d.ts +++ b/packages/subproviders/src/globals.d.ts @@ -125,6 +125,13 @@ declare module 'hdkey' { export = HDNode; } +declare module '*.json' { + const json: any; + /* tslint:disable */ + export default json; + /* tslint:enable */ +} + // ganache-core declarations declare module 'ganache-core' { import * as Web3 from 'web3'; @@ -137,5 +144,6 @@ declare module 'ganache-core' { networkId: number; mnemonic: string; } + // tslint:disable-next-line:completed-docs export function provider(opts: GanacheOpts): Web3.Provider; } diff --git a/packages/subproviders/src/monorepo_scripts/postpublish.ts b/packages/subproviders/src/monorepo_scripts/postpublish.ts new file mode 100644 index 000000000..dcb99d0f7 --- /dev/null +++ b/packages/subproviders/src/monorepo_scripts/postpublish.ts @@ -0,0 +1,8 @@ +import { postpublishUtils } from '@0xproject/monorepo-scripts'; + +import * as packageJSON from '../package.json'; +import * as tsConfigJSON from '../tsconfig.json'; + +const cwd = `${__dirname}/..`; +// tslint:disable-next-line:no-floating-promises +postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd); |