diff options
Diffstat (limited to 'packages/website')
| -rw-r--r-- | packages/website/md/docs/sol_cov/usage.md | 8 | ||||
| -rw-r--r-- | packages/website/package.json | 18 | ||||
| -rw-r--r-- | packages/website/ts/containers/zero_ex_js_documentation.ts | 1 |
3 files changed, 10 insertions, 17 deletions
diff --git a/packages/website/md/docs/sol_cov/usage.md b/packages/website/md/docs/sol_cov/usage.md index 59638f611..433cfad96 100644 --- a/packages/website/md/docs/sol_cov/usage.md +++ b/packages/website/md/docs/sol_cov/usage.md @@ -11,9 +11,6 @@ In order to use `CoverageSubprovider` with your favorite framework you need to p If you are generating your artifacts with [@0xproject/sol-compiler](LINK) you can use the `SolCompilerArtifactsAdapter` we've implemented for you. ```typescript -<<<<<<< HEAD -import { CoverageSubprovider } from '@0xproject/sol-cov'; -======= import { SolCompilerArtifactsAdapter } from '@0xproject/sol-cov'; const artifactsPath = 'src/artifacts'; const contractsPath = 'src/contracts'; @@ -42,7 +39,6 @@ Look at the code of the two adapters above for examples. ```typescript import { CoverageSubprovider } from '@0xproject/sol-cov'; import ProviderEngine = require('web3-provider-engine'); ->>>>>>> Improve sol-cov docs const provider = new ProviderEngine(); @@ -51,12 +47,8 @@ const contractsPath = 'src/contracts'; const networkId = 50; // Some calls might not have `from` address specified. Nevertheless - transactions need to be submitted from an address with at least some funds. defaultFromAddress is the address that will be used to submit those calls as transactions from. const defaultFromAddress = '0x5409ed021d9299bf6814279a6a1411a7e866a631'; -<<<<<<< HEAD -const coverageSubprovider = new CoverageSubprovider(artifactsPath, contractsPath, defaultFromAddress); -======= const isVerbose = true; const coverageSubprovider = new CoverageSubprovider(artifactsAdapter, defaultFromAddress, isVerbose); ->>>>>>> Improve sol-cov docs provider.addProvider(coverageSubprovider); ``` diff --git a/packages/website/package.json b/packages/website/package.json index 5287414c7..a2ac617eb 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/website", - "version": "0.0.33", + "version": "0.0.37", "engines": { "node": ">=6.12" }, @@ -18,14 +18,14 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "@0xproject/contract-wrappers": "^0.0.2", - "@0xproject/react-docs": "^0.0.12", - "@0xproject/react-shared": "^0.1.7", - "@0xproject/subproviders": "^0.10.2", - "@0xproject/types": "0.7.0", - "@0xproject/typescript-typings": "^0.3.2", - "@0xproject/utils": "^0.6.2", - "@0xproject/web3-wrapper": "^0.6.4", + "@0xproject/contract-wrappers": "^0.0.5", + "@0xproject/react-docs": "^0.0.14", + "@0xproject/react-shared": "^0.2.1", + "@0xproject/subproviders": "^0.10.4", + "@0xproject/types": "^0.8.1", + "@0xproject/typescript-typings": "^0.4.1", + "@0xproject/utils": "^0.7.1", + "@0xproject/web3-wrapper": "^0.7.1", "accounting": "^0.4.1", "basscss": "^8.0.3", "blockies": "^0.0.2", diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts index a8890a07a..bd0d1732a 100644 --- a/packages/website/ts/containers/zero_ex_js_documentation.ts +++ b/packages/website/ts/containers/zero_ex_js_documentation.ts @@ -173,6 +173,7 @@ const docsInfoConfig: DocsInfoConfig = { 'OrderStateInvalid', 'OrderState', 'OrderStateWatcherConfig', + 'OrderWatcherConfig', 'FilterObject', 'OrderRelevantState', 'JSONRPCRequestPayload', |