aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-08-25 04:38:30 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-08-25 04:38:30 +0800
commit44a430802e534f8b1eccb57ed87249925c32d4eb (patch)
treeec3ee9b35c231da47764bea7381f46fa6766b432 /packages/website
parent6b03cfd40d720096bf772c2966b1372c0e54bf51 (diff)
parent7f36574a57ced8ead0059b90673fe01f97f04827 (diff)
downloaddexon-sol-tools-44a430802e534f8b1eccb57ed87249925c32d4eb.tar
dexon-sol-tools-44a430802e534f8b1eccb57ed87249925c32d4eb.tar.gz
dexon-sol-tools-44a430802e534f8b1eccb57ed87249925c32d4eb.tar.bz2
dexon-sol-tools-44a430802e534f8b1eccb57ed87249925c32d4eb.tar.lz
dexon-sol-tools-44a430802e534f8b1eccb57ed87249925c32d4eb.tar.xz
dexon-sol-tools-44a430802e534f8b1eccb57ed87249925c32d4eb.tar.zst
dexon-sol-tools-44a430802e534f8b1eccb57ed87249925c32d4eb.zip
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into website/feature/react-16
Diffstat (limited to 'packages/website')
-rw-r--r--packages/website/md/docs/connect/2.0.0/introduction.md3
-rw-r--r--packages/website/package.json10
-rw-r--r--packages/website/ts/containers/connect_documentation.ts5
3 files changed, 13 insertions, 5 deletions
diff --git a/packages/website/md/docs/connect/2.0.0/introduction.md b/packages/website/md/docs/connect/2.0.0/introduction.md
new file mode 100644
index 000000000..de7ece7ae
--- /dev/null
+++ b/packages/website/md/docs/connect/2.0.0/introduction.md
@@ -0,0 +1,3 @@
+<b>**NOTE:** Release candidate versions are meant to work with V2 of the Standard Relayer API. To interact with V1, select a 1.X version of connect.</b>
+
+Welcome to the [0x Connect](https://github.com/0xProject/0x-monorepo/tree/development/packages/connect) documentation! 0x Connect is a Javascript library that makes it easy to interact with relayers that conform to the [Standard Relayer API](https://github.com/0xProject/standard-relayer-api). Functionality includes getting supported asset pairs from a relayer, getting orders filtered by different attributes, getting individual orders specified by order hash, getting orderbooks for specific asset pairs, getting fee information, and submitting orders.
diff --git a/packages/website/package.json b/packages/website/package.json
index d5157850c..9eed39572 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/website",
- "version": "0.0.44",
+ "version": "0.0.45",
"engines": {
"node": ">=6.12"
},
@@ -20,13 +20,13 @@
"dependencies": {
"@0xproject/contract-wrappers": "^0.0.5",
"@0xproject/order-utils": "^0.0.9",
- "@0xproject/react-docs": "^1.0.5",
+ "@0xproject/react-docs": "^1.0.6",
"@0xproject/react-shared": "^0.2.3",
- "@0xproject/subproviders": "^1.0.5",
+ "@0xproject/subproviders": "^2.0.0",
"@0xproject/types": "^0.8.1",
"@0xproject/typescript-typings": "^0.4.3",
- "@0xproject/utils": "^1.0.5",
- "@0xproject/web3-wrapper": "^1.2.0",
+ "@0xproject/utils": "^1.0.6",
+ "@0xproject/web3-wrapper": "^2.0.0",
"accounting": "^0.4.1",
"basscss": "^8.0.3",
"blockies": "^0.0.2",
diff --git a/packages/website/ts/containers/connect_documentation.ts b/packages/website/ts/containers/connect_documentation.ts
index 8b13081c6..90137243c 100644
--- a/packages/website/ts/containers/connect_documentation.ts
+++ b/packages/website/ts/containers/connect_documentation.ts
@@ -10,6 +10,7 @@ import { Translate } from 'ts/utils/translate';
/* tslint:disable:no-var-requires */
const IntroMarkdownV1 = require('md/docs/connect/1.0.0/introduction');
+const IntroMarkdownV2 = require('md/docs/connect/2.0.0/introduction');
const InstallationMarkdownV1 = require('md/docs/connect/1.0.0/installation');
/* tslint:enable:no-var-requires */
@@ -33,6 +34,10 @@ const docsInfoConfig: DocsInfoConfig = {
[markdownSections.introduction]: IntroMarkdownV1,
[markdownSections.installation]: InstallationMarkdownV1,
},
+ '2.0.0-rc.1': {
+ [markdownSections.introduction]: IntroMarkdownV2,
+ [markdownSections.installation]: InstallationMarkdownV1,
+ },
},
markdownSections,
};