From cc7dec7a99550038555a5367615bad214a06f893 Mon Sep 17 00:00:00 2001 From: fabioberger Date: Wed, 24 Jul 2019 23:27:03 +0200 Subject: [PATCH 1/4] Move `react-docs` into `website` and delete it as a standalone package --- .github/autolabeler.yml | 1 - .gitignore | 1 - README.md | 25 +- .../monorepo-scripts/src/test_installation.ts | 2 +- packages/react-docs/.npmignore | 9 - packages/react-docs/CHANGELOG.json | 543 ------------------ packages/react-docs/CHANGELOG.md | 240 -------- packages/react-docs/README.md | 96 ---- packages/react-docs/package.json | 62 -- packages/react-docs/src/globals.d.ts | 6 - packages/react-docs/src/index.ts | 23 - packages/react-docs/src/types.ts | 66 --- packages/react-docs/src/utils/constants.ts | 10 - packages/react-docs/tsconfig.json | 14 - packages/react-docs/tslint.json | 9 - packages/website/package.json | 5 +- .../documentation/reference}/badge.tsx | 0 .../documentation/reference}/comment.tsx | 0 .../documentation/reference}/custom_enum.tsx | 0 .../reference}/doc_reference.tsx | 6 +- .../documentation/reference}/enum.tsx | 2 +- .../reference}/event_definition.tsx | 2 +- .../documentation/reference}/interface.tsx | 2 +- .../reference}/property_block.tsx | 4 +- .../documentation/reference}/signature.tsx | 2 +- .../reference}/signature_block.tsx | 4 +- .../documentation/reference}/source_link.tsx | 0 .../documentation/reference}/type.tsx | 2 +- .../reference}/type_definition.tsx | 6 +- .../website/ts/components/top_bar/top_bar.tsx | 3 +- .../containers/asset_buyer_documentation.ts | 2 +- .../ts/containers/connect_documentation.ts | 2 +- .../contract_wrappers_documentation.ts | 2 +- .../ethereum_types_documentation.ts | 5 +- .../containers/json_schemas_documentation.ts | 2 +- .../ts/containers/migrations_documentation.ts | 4 +- .../containers/order_utils_documentation.ts | 2 +- .../containers/order_watcher_documentation.ts | 2 +- .../smart_contracts_documentation.ts | 2 +- .../containers/sol_compiler_documentation.ts | 2 +- .../containers/sol_coverage_documentation.ts | 2 +- .../containers/sol_profiler_documentation.ts | 2 +- .../ts/containers/sol_trace_documentation.ts | 2 +- .../containers/subproviders_documentation.ts | 2 +- .../containers/web3_wrapper_documentation.ts | 2 +- .../ts/containers/zero_ex_js_documentation.ts | 2 +- .../ts/pages/documentation/doc_page.tsx | 14 +- packages/website/ts/types.ts | 67 +++ packages/website/ts/utils/constants.ts | 8 + packages/website/ts/utils/doc_utils.ts | 2 +- .../src => website/ts/utils}/docs_info.ts | 5 +- .../ts/utils/documentation_container.ts | 5 +- .../src => website/ts}/utils/typedoc_utils.ts | 2 +- tsconfig.json | 1 - yarn.lock | 13 +- 55 files changed, 148 insertions(+), 1151 deletions(-) delete mode 100644 packages/react-docs/.npmignore delete mode 100644 packages/react-docs/CHANGELOG.json delete mode 100644 packages/react-docs/CHANGELOG.md delete mode 100644 packages/react-docs/README.md delete mode 100644 packages/react-docs/package.json delete mode 100644 packages/react-docs/src/globals.d.ts delete mode 100644 packages/react-docs/src/index.ts delete mode 100644 packages/react-docs/src/types.ts delete mode 100644 packages/react-docs/src/utils/constants.ts delete mode 100644 packages/react-docs/tsconfig.json delete mode 100644 packages/react-docs/tslint.json rename packages/{react-docs/src/components => website/ts/components/documentation/reference}/badge.tsx (100%) rename packages/{react-docs/src/components => website/ts/components/documentation/reference}/comment.tsx (100%) rename packages/{react-docs/src/components => website/ts/components/documentation/reference}/custom_enum.tsx (100%) rename packages/{react-docs/src/components => website/ts/components/documentation/reference}/doc_reference.tsx (98%) rename packages/{react-docs/src/components => website/ts/components/documentation/reference}/enum.tsx (92%) rename packages/{react-docs/src/components => website/ts/components/documentation/reference}/event_definition.tsx (98%) rename packages/{react-docs/src/components => website/ts/components/documentation/reference}/interface.tsx (98%) rename packages/{react-docs/src/components => website/ts/components/documentation/reference}/property_block.tsx (96%) rename packages/{react-docs/src/components => website/ts/components/documentation/reference}/signature.tsx (98%) rename packages/{react-docs/src/components => website/ts/components/documentation/reference}/signature_block.tsx (98%) rename packages/{react-docs/src/components => website/ts/components/documentation/reference}/source_link.tsx (100%) rename packages/{react-docs/src/components => website/ts/components/documentation/reference}/type.tsx (99%) rename packages/{react-docs/src/components => website/ts/components/documentation/reference}/type_definition.tsx (97%) rename packages/{react-docs/src => website/ts/utils}/docs_info.ts (98%) rename packages/{react-docs/src => website/ts}/utils/typedoc_utils.ts (99%) diff --git a/.github/autolabeler.yml b/.github/autolabeler.yml index 70ba92e871..cf40d91812 100644 --- a/.github/autolabeler.yml +++ b/.github/autolabeler.yml @@ -22,7 +22,6 @@ contracts: ['contracts'] @0x/tslint-config: ['packages/tslint-config'] @0x/asset-buyer: ['packages/asset-buyer'] @0x/order-watcher: ['packages/order-watcher'] -@0x/react-docs: ['packages/react-docs'] @0x/order-utils: ['packages/order-utils'] @0x/react-shared: ['packages/react-shared'] @0x/assert: ['packages/assert'] diff --git a/.gitignore b/.gitignore index 9fde6b4c0f..679011a773 100644 --- a/.gitignore +++ b/.gitignore @@ -77,7 +77,6 @@ TODO.md packages/website/public/bundle* packages/dev-tools-pages/public/bundle* -packages/react-docs/example/public/bundle* # server cli packages/testnet-faucets/server/ diff --git a/README.md b/README.md index 00099e4c27..c061e7a07d 100644 --- a/README.md +++ b/README.md @@ -87,19 +87,18 @@ These packages are all under development. See [/contracts/README.md](/contracts/ #### Utilities -| Package | Version | Description | -| -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------- | -| [`@0x/abi-gen`](/packages/abi-gen) | [![npm](https://img.shields.io/npm/v/@0x/abi-gen.svg)](https://www.npmjs.com/package/@0x/abi-gen) | Tool to generate TS wrappers from smart contract ABIs | -| [`@0x/tslint-config`](/packages/tslint-config) | [![npm](https://img.shields.io/npm/v/@0x/tslint-config.svg)](https://www.npmjs.com/package/@0x/tslint-config) | Custom TSLint rules used by the 0x core team | -| [`@0x/types`](/packages/types) | [![npm](https://img.shields.io/npm/v/@0x/types.svg)](https://www.npmjs.com/package/@0x/types) | Shared type declarations | -| [`@0x/typescript-typings`](/packages/typescript-typings) | [![npm](https://img.shields.io/npm/v/@0x/typescript-typings.svg)](https://www.npmjs.com/package/@0x/typescript-typings) | Repository of types for external packages | -| [`@0x/utils`](/packages/utils) | [![npm](https://img.shields.io/npm/v/@0x/utils.svg)](https://www.npmjs.com/package/@0x/utils) | Shared utilities | -| [`@0x/react-docs`](/packages/react-docs) | [![npm](https://img.shields.io/npm/v/@0x/react-docs.svg)](https://www.npmjs.com/package/@0x/react-docs) | React documentation component for rendering TypeDoc & sol-doc generated JSON | -| [`@0x/react-shared`](/packages/react-shared) | [![npm](https://img.shields.io/npm/v/@0x/react-shared.svg)](https://www.npmjs.com/package/@0x/react-shared) | 0x shared react components | -| [`@0x/assert`](/packages/assert) | [![npm](https://img.shields.io/npm/v/@0x/assert.svg)](https://www.npmjs.com/package/@0x/assert) | Type and schema assertions used by our packages | -| [`@0x/base-contract`](/packages/base-contract) | [![npm](https://img.shields.io/npm/v/@0x/base-contract.svg)](https://www.npmjs.com/package/@0x/base-contract) | BaseContract used by auto-generated `abi-gen` wrapper contracts | -| [`@0x/dev-utils`](/packages/dev-utils) | [![npm](https://img.shields.io/npm/v/@0x/dev-utils.svg)](https://www.npmjs.com/package/@0x/dev-utils) | Dev utils to be shared across 0x packages | -| [`@0x/fill-scenarios`](/packages/fill-scenarios) | [![npm](https://img.shields.io/npm/v/@0x/fill-scenarios.svg)](https://www.npmjs.com/package/@0x/fill-scenarios) | 0x order fill scenario generator | +| Package | Version | Description | +| -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------- | +| [`@0x/abi-gen`](/packages/abi-gen) | [![npm](https://img.shields.io/npm/v/@0x/abi-gen.svg)](https://www.npmjs.com/package/@0x/abi-gen) | Tool to generate TS wrappers from smart contract ABIs | +| [`@0x/tslint-config`](/packages/tslint-config) | [![npm](https://img.shields.io/npm/v/@0x/tslint-config.svg)](https://www.npmjs.com/package/@0x/tslint-config) | Custom TSLint rules used by the 0x core team | +| [`@0x/types`](/packages/types) | [![npm](https://img.shields.io/npm/v/@0x/types.svg)](https://www.npmjs.com/package/@0x/types) | Shared type declarations | +| [`@0x/typescript-typings`](/packages/typescript-typings) | [![npm](https://img.shields.io/npm/v/@0x/typescript-typings.svg)](https://www.npmjs.com/package/@0x/typescript-typings) | Repository of types for external packages | +| [`@0x/utils`](/packages/utils) | [![npm](https://img.shields.io/npm/v/@0x/utils.svg)](https://www.npmjs.com/package/@0x/utils) | Shared utilities | +| [`@0x/react-shared`](/packages/react-shared) | [![npm](https://img.shields.io/npm/v/@0x/react-shared.svg)](https://www.npmjs.com/package/@0x/react-shared) | 0x shared react components | +| [`@0x/assert`](/packages/assert) | [![npm](https://img.shields.io/npm/v/@0x/assert.svg)](https://www.npmjs.com/package/@0x/assert) | Type and schema assertions used by our packages | +| [`@0x/base-contract`](/packages/base-contract) | [![npm](https://img.shields.io/npm/v/@0x/base-contract.svg)](https://www.npmjs.com/package/@0x/base-contract) | BaseContract used by auto-generated `abi-gen` wrapper contracts | +| [`@0x/dev-utils`](/packages/dev-utils) | [![npm](https://img.shields.io/npm/v/@0x/dev-utils.svg)](https://www.npmjs.com/package/@0x/dev-utils) | Dev utils to be shared across 0x packages | +| [`@0x/fill-scenarios`](/packages/fill-scenarios) | [![npm](https://img.shields.io/npm/v/@0x/fill-scenarios.svg)](https://www.npmjs.com/package/@0x/fill-scenarios) | 0x order fill scenario generator | #### Private Packages diff --git a/packages/monorepo-scripts/src/test_installation.ts b/packages/monorepo-scripts/src/test_installation.ts index 64d60e0103..1591853e7d 100644 --- a/packages/monorepo-scripts/src/test_installation.ts +++ b/packages/monorepo-scripts/src/test_installation.ts @@ -12,7 +12,7 @@ import { Changelog, Package } from './types'; import { utils } from './utils/utils'; // Packages might not be runnable if they are command-line tools or only run in browsers. -const UNRUNNABLE_PACKAGES = ['@0x/abi-gen', '@0x/react-shared', '@0x/react-docs']; +const UNRUNNABLE_PACKAGES = ['@0x/abi-gen', '@0x/react-shared']; const mkdirpAsync = promisify(mkdirp); const rimrafAsync = promisify(rimraf); diff --git a/packages/react-docs/.npmignore b/packages/react-docs/.npmignore deleted file mode 100644 index ea588d4859..0000000000 --- a/packages/react-docs/.npmignore +++ /dev/null @@ -1,9 +0,0 @@ -# Blacklist all files -.* -* -# Whitelist lib -!lib/**/* -# Blacklist tests and publish scripts -/lib/test/* -/lib/monorepo_scripts/ -# Package specific ignore diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json deleted file mode 100644 index 0b68b70a5d..0000000000 --- a/packages/react-docs/CHANGELOG.json +++ /dev/null @@ -1,543 +0,0 @@ -[ - { - "timestamp": 1563957393, - "version": "2.0.15", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1563047529, - "version": "2.0.14", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1563006338, - "version": "2.0.13", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1558712885, - "version": "2.0.12", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1557507213, - "version": "2.0.11", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "2.0.10", - "changes": [ - { - "note": "Dependencies updated" - } - ], - "timestamp": 1554997931 - }, - { - "timestamp": 1553183790, - "version": "2.0.9", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1553091633, - "version": "2.0.8", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1551479279, - "version": "2.0.7", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1551220833, - "version": "2.0.6", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1551130135, - "version": "2.0.5", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1549733923, - "version": "2.0.4", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "2.0.3", - "changes": [ - { - "note": "Dependencies updated" - } - ], - "timestamp": 1549547375 - }, - { - "timestamp": 1549504360, - "version": "2.0.2", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1549452781, - "version": "2.0.1", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "2.0.0", - "changes": [ - { - "note": "Upgrade the bignumber.js to v8.0.2", - "pr": 1517 - } - ], - "timestamp": 1549373905 - }, - { - "timestamp": 1547561734, - "version": "1.0.25", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1547225310, - "version": "1.0.24", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1547040760, - "version": "1.0.23", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "1.0.22", - "changes": [ - { - "note": "Dependencies updated" - } - ], - "timestamp": 1544739608 - }, - { - "version": "1.0.21", - "changes": [ - { - "note": "Dependencies updated" - } - ], - "timestamp": 1544570656 - }, - { - "timestamp": 1543401373, - "version": "1.0.20", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1542821676, - "version": "1.0.19", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1542208198, - "version": "1.0.18", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1542134075, - "version": "1.0.17", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1542028948, - "version": "1.0.16", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "1.0.15", - "changes": [ - { - "note": "Dependencies updated" - } - ], - "timestamp": 1541740904 - }, - { - "timestamp": 1539871071, - "version": "1.0.14", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "1.0.13", - "changes": [ - { - "note": "Dependencies updated" - } - ], - "timestamp": 1538693146 - }, - { - "timestamp": 1538157789, - "version": "1.0.12", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1537907159, - "version": "1.0.11", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1537875740, - "version": "1.0.10", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1537541580, - "version": "1.0.9", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1536142250, - "version": "1.0.8", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1535377027, - "version": "1.0.7", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1535133899, - "version": "1.0.6", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1534210131, - "version": "1.0.5", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1532619515, - "version": "1.0.4", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1532614997, - "version": "1.0.3", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1532605697, - "version": "1.0.2", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1532357734, - "version": "1.0.1", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1532043000, - "version": "1.0.0", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1531919263, - "version": "0.0.17", - "changes": [ - { - "note": "Nest MD files under versions so that you can update them for future versions", - "pr": 844 - } - ] - }, - { - "timestamp": 1531919263, - "version": "0.0.16", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1531149657, - "version": "0.0.15", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1529397769, - "version": "0.0.14", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "0.0.13", - "changes": [ - { - "note": "Incorrect publish that was unpublished" - } - ], - "timestamp": 1527810075 - }, - { - "timestamp": 1527009133, - "version": "0.0.12", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1525477860, - "version": "0.0.11", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1525466747, - "version": "0.0.10", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1525428773, - "version": "0.0.9", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "0.0.8", - "changes": [ - { - "note": "Added support for rendering default param values", - "pr": 519 - }, - { - "note": "Added support for rendering nested function types within interface types", - "pr": 519 - }, - { - "note": "Improve type comment rendering", - "pr": 535 - } - ], - "timestamp": 1524044013 - }, - { - "timestamp": 1523462196, - "version": "0.0.7", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1522673609, - "version": "0.0.6", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "0.0.5", - "changes": [ - { - "note": "Handle `reflection` type rendering so that anonymous function type declarations render properly", - "pr": 465 - }, - { - "note": "Rename `MethodSignature` to `Signature` and change it's props so that it can be used to render method and function signatures.", - "pr": 465 - }, - { - "note": "Rename `MethodBlock` to `SignatureBlock` since it is not used to render method and function signature blocks.", - "pr": 465 - }, - { - "note": "Add support for documenting exported functions.", - "pr": 465 - } - ], - "timestamp": 1522658513 - }, - { - "version": "0.0.3", - "changes": [ - { - "note": "Move TS typings from devDependencies to dependencies since they are needed by the package user." - } - ], - "timestamp": 1521298800 - }, - { - "version": "0.0.2", - "changes": [ - { - "note": "Move example out into a separate sub-package" - }, - { - "note": "Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package", - "pr": 452 - } - ], - "timestamp": 1521298800 - } -] diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md deleted file mode 100644 index 56c91dbba8..0000000000 --- a/packages/react-docs/CHANGELOG.md +++ /dev/null @@ -1,240 +0,0 @@ - - -CHANGELOG - -## v2.0.15 - _July 24, 2019_ - - * Dependencies updated - -## v2.0.14 - _July 13, 2019_ - - * Dependencies updated - -## v2.0.13 - _July 13, 2019_ - - * Dependencies updated - -## v2.0.12 - _May 24, 2019_ - - * Dependencies updated - -## v2.0.11 - _May 10, 2019_ - - * Dependencies updated - -## v2.0.10 - _April 11, 2019_ - - * Dependencies updated - -## v2.0.9 - _March 21, 2019_ - - * Dependencies updated - -## v2.0.8 - _March 20, 2019_ - - * Dependencies updated - -## v2.0.7 - _March 1, 2019_ - - * Dependencies updated - -## v2.0.6 - _February 26, 2019_ - - * Dependencies updated - -## v2.0.5 - _February 25, 2019_ - - * Dependencies updated - -## v2.0.4 - _February 9, 2019_ - - * Dependencies updated - -## v2.0.3 - _February 7, 2019_ - - * Dependencies updated - -## v2.0.2 - _February 7, 2019_ - - * Dependencies updated - -## v2.0.1 - _February 6, 2019_ - - * Dependencies updated - -## v2.0.0 - _February 5, 2019_ - - * Upgrade the bignumber.js to v8.0.2 (#1517) - -## v1.0.25 - _January 15, 2019_ - - * Dependencies updated - -## v1.0.24 - _January 11, 2019_ - - * Dependencies updated - -## v1.0.23 - _January 9, 2019_ - - * Dependencies updated - -## v1.0.22 - _December 13, 2018_ - - * Dependencies updated - -## v1.0.21 - _December 11, 2018_ - - * Dependencies updated - -## v1.0.20 - _November 28, 2018_ - - * Dependencies updated - -## v1.0.19 - _November 21, 2018_ - - * Dependencies updated - -## v1.0.18 - _November 14, 2018_ - - * Dependencies updated - -## v1.0.17 - _November 13, 2018_ - - * Dependencies updated - -## v1.0.16 - _November 12, 2018_ - - * Dependencies updated - -## v1.0.15 - _November 9, 2018_ - - * Dependencies updated - -## v1.0.14 - _October 18, 2018_ - - * Dependencies updated - -## v1.0.13 - _October 4, 2018_ - - * Dependencies updated - -## v1.0.12 - _September 28, 2018_ - - * Dependencies updated - -## v1.0.11 - _September 25, 2018_ - - * Dependencies updated - -## v1.0.10 - _September 25, 2018_ - - * Dependencies updated - -## v1.0.9 - _September 21, 2018_ - - * Dependencies updated - -## v1.0.8 - _September 5, 2018_ - - * Dependencies updated - -## v1.0.7 - _August 27, 2018_ - - * Dependencies updated - -## v1.0.6 - _August 24, 2018_ - - * Dependencies updated - -## v1.0.5 - _August 14, 2018_ - - * Dependencies updated - -## v1.0.4 - _July 26, 2018_ - - * Dependencies updated - -## v1.0.3 - _July 26, 2018_ - - * Dependencies updated - -## v1.0.2 - _July 26, 2018_ - - * Dependencies updated - -## v1.0.1 - _July 23, 2018_ - - * Dependencies updated - -## v1.0.0 - _July 19, 2018_ - - * Dependencies updated - -## v0.0.17 - _July 18, 2018_ - - * Nest MD files under versions so that you can update them for future versions (#844) - -## v0.0.16 - _July 18, 2018_ - - * Dependencies updated - -## v0.0.15 - _July 9, 2018_ - - * Dependencies updated - -## v0.0.14 - _June 19, 2018_ - - * Dependencies updated - -## v0.0.13 - _May 31, 2018_ - - * Incorrect publish that was unpublished - -## v0.0.12 - _May 22, 2018_ - - * Dependencies updated - -## v0.0.11 - _May 4, 2018_ - - * Dependencies updated - -## v0.0.10 - _May 4, 2018_ - - * Dependencies updated - -## v0.0.9 - _May 4, 2018_ - - * Dependencies updated - -## v0.0.8 - _April 18, 2018_ - - * Added support for rendering default param values (#519) - * Added support for rendering nested function types within interface types (#519) - * Improve type comment rendering (#535) - -## v0.0.7 - _April 11, 2018_ - - * Dependencies updated - -## v0.0.6 - _April 2, 2018_ - - * Dependencies updated - -## v0.0.5 - _April 2, 2018_ - - * Handle `reflection` type rendering so that anonymous function type declarations render properly (#465) - * Rename `MethodSignature` to `Signature` and change it's props so that it can be used to render method and function signatures. (#465) - * Rename `MethodBlock` to `SignatureBlock` since it is not used to render method and function signature blocks. (#465) - * Add support for documenting exported functions. (#465) - -## v0.0.3 - _March 17, 2018_ - - * Move TS typings from devDependencies to dependencies since they are needed by the package user. - -## v0.0.2 - _March 17, 2018_ - - * Move example out into a separate sub-package - * Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package (#452) diff --git a/packages/react-docs/README.md b/packages/react-docs/README.md deleted file mode 100644 index 7b1f4f80ac..0000000000 --- a/packages/react-docs/README.md +++ /dev/null @@ -1,96 +0,0 @@ -## @0x/react-docs - -#### WARNING: Alpha software. Expect things to break when trying to use. - -A full-page React component for rendering beautiful documentation for Solidity and Typescript code generated with [TypeDoc](http://typedoc.org/) or [sol-doc](https://github.com/0xProject/0x-monorepo/tree/development/packages/sol-doc). - -
- -
react-docs generating 0x's smart contract docs
-
- -#### Features - -- Mobile optimized -- Reads Javadoc-style comments in your code to generate class/method/argument/return/type comments. -- Syntax highlighting support for TypeScript & Solidity -- Type declaration linking -- Type declaration popovers to avoid clicking through to the definition -- Section/method/type anchors for easily pointing others to a specific part of your docs. -- Version picker -- Customizable sidebar header -- Supports custom markdown sections so you can easily add an intro or installation instructions. - -## Installation - -```bash -yarn add @0x/react-docs -``` - -## Usage - -This package exposes both a single `Documentation` react component that will render a docs page, as well as all of it's sub-components in case someone wants to build their own layout. - -Currently this package still has some external dependencies outside of the `Documentation` component, so please start your project off by copying the [react-docs-example](https://github.com/0xProject/0x-monorepo/tree/development/packages/react-docs-example) directory and modifying it there. If you need changes in the [react-docs](https://github.com/0xProject/0x-monorepo/tree/development/packages/react-docs) package, fork the 0x monorepo, make the required changes and submit a PR. Until we merge it, you can have your project depend on your own custom fork. - -If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: - -```json -"compilerOptions": { - "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], -} -``` - -## Future improvements - -Feel free to contribute to these improvements! - -- Allow user to pass in styling for all major elements similar to [Material-UI](http://www.material-ui.com/). -- Allow user to define an alternative font and have it change everywhere. -- Add source links to Solidity docs (currently unsupported by solc, which underlies sol-doc). - -## Contributing - -We welcome improvements and fixes from the wider community! To report bugs within this package, please create an issue in this repository. - -Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started. - -### Install dependencies - -If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them: - -```bash -yarn config set workspaces-experimental true -``` - -Then install dependencies - -```bash -yarn install -``` - -### Build - -To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: - -```bash -PKG=@0x/react-docs yarn build -``` - -Or continuously rebuild on change: - -```bash -PKG=@0x/react-docs yarn watch -``` - -### Clean - -```bash -yarn clean -``` - -### Lint - -```bash -yarn lint -``` diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json deleted file mode 100644 index 2a9ea6b530..0000000000 --- a/packages/react-docs/package.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "name": "@0x/react-docs", - "version": "2.0.15", - "engines": { - "node": ">=6.12" - }, - "description": "React documentation component for rendering TypeDoc & sol-doc generated JSON", - "main": "lib/index.js", - "types": "lib/index.d.ts", - "scripts": { - "lint": "tslint --format stylish --project .", - "fix": "tslint --fix --format stylish --project .", - "build": "tsc -b", - "build:ci": "yarn build", - "clean": "shx rm -rf lib" - }, - "author": "Fabio Berger", - "license": "Apache-2.0", - "bugs": { - "url": "https://github.com/0xProject/0x-monorepo/issues" - }, - "homepage": "https://github.com/0xProject/0x-monorepo/packages/react-docs/README.md", - "repository": { - "type": "git", - "url": "https://github.com/0xProject/0x-monorepo.git" - }, - "devDependencies": { - "@0x/dev-utils": "^2.2.5", - "@0x/tslint-config": "^3.0.1", - "@types/compare-versions": "^3.0.0", - "@types/styled-components": "4.1.1", - "make-promises-safe": "^1.1.0", - "shx": "^0.2.2", - "tslint": "5.11.0", - "typescript": "3.0.1" - }, - "dependencies": { - "@0x/react-shared": "^2.0.15", - "@0x/types": "^2.4.1", - "@0x/utils": "^4.4.1", - "@types/lodash": "4.14.104", - "@types/material-ui": "^0.20.0", - "@types/node": "*", - "@types/react": "*", - "@types/react-dom": "*", - "@types/react-scroll": "1.5.3", - "basscss": "^8.0.3", - "compare-versions": "^3.0.1", - "lodash": "^4.17.11", - "material-ui": "^0.20.0", - "react": "^16.5.2", - "react-dom": "^16.5.2", - "react-markdown": "^3.2.2", - "react-scroll": "0xproject/react-scroll#pr-330-and-replace-state", - "react-tooltip": "^3.2.7", - "semver": "5.5.0", - "styled-components": "^4.1.1" - }, - "publishConfig": { - "access": "public" - } -} diff --git a/packages/react-docs/src/globals.d.ts b/packages/react-docs/src/globals.d.ts deleted file mode 100644 index 94e63a32de..0000000000 --- a/packages/react-docs/src/globals.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -declare module '*.json' { - const json: any; - /* tslint:disable */ - export default json; - /* tslint:enable */ -} diff --git a/packages/react-docs/src/index.ts b/packages/react-docs/src/index.ts deleted file mode 100644 index a5ed788b15..0000000000 --- a/packages/react-docs/src/index.ts +++ /dev/null @@ -1,23 +0,0 @@ -export { DocAgnosticFormat, GeneratedDocJson } from '@0x/types'; - -// Exported to give users of this library added flexibility if they want to build -// a docs page from scratch using the individual components. -export { Badge } from './components/badge'; -export { Comment } from './components/comment'; -export { CustomEnum } from './components/custom_enum'; -export { DocReference } from './components/doc_reference'; -export { Enum } from './components/enum'; -export { EventDefinition } from './components/event_definition'; -export { Interface } from './components/interface'; -export { SignatureBlock } from './components/signature_block'; -export { Signature } from './components/signature'; -export { SourceLink } from './components/source_link'; -export { TypeDefinition } from './components/type_definition'; -export { Type } from './components/type'; -export { TypeDocUtils } from './utils/typedoc_utils'; - -export { DocsInfo } from './docs_info'; - -export { DocsInfoConfig, DocsMenu, SupportedDocJson } from './types'; - -export { constants } from './utils/constants'; diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts deleted file mode 100644 index 1534485132..0000000000 --- a/packages/react-docs/src/types.ts +++ /dev/null @@ -1,66 +0,0 @@ -export interface SectionNameToMarkdownByVersion { - [version: string]: { [sectionName: string]: string }; -} - -export interface DocsInfoConfig { - id: string; - packageName: string; - type: SupportedDocJson; - displayName: string; - packageUrl: string; - markdownMenu: DocsMenu; - markdownSections: SectionsMap; - sectionNameToMarkdownByVersion: SectionNameToMarkdownByVersion; - contractsByVersionByNetworkId?: ContractsByVersionByNetworkId; -} - -export interface DocsMenu { - [sectionName: string]: string[]; -} - -export interface SectionsMap { - [sectionName: string]: string; -} - -// Exception: We don't make the values uppercase because these KindString's need to -// match up those returned by TypeDoc -export enum KindString { - Constructor = 'Constructor', - Property = 'Property', - Method = 'Method', - Interface = 'Interface', - TypeAlias = 'Type alias', - ObjectLiteral = 'Object literal', - Variable = 'Variable', - Function = 'Function', - Enumeration = 'Enumeration', - Class = 'Class', -} - -export enum SupportedDocJson { - SolDoc = 'SOL_DOC', - TypeDoc = 'TYPEDOC', -} - -export interface ContractsByVersionByNetworkId { - [version: string]: { - [networkName: string]: { - [contractName: string]: string; - }; - }; -} - -export interface AddressByContractName { - [contractName: string]: string; -} - -export interface EnumValue { - name: string; - defaultValue?: string; -} - -export enum AbiTypes { - Constructor = 'constructor', - Function = 'function', - Event = 'event', -} diff --git a/packages/react-docs/src/utils/constants.ts b/packages/react-docs/src/utils/constants.ts deleted file mode 100644 index b5b6cc00d0..0000000000 --- a/packages/react-docs/src/utils/constants.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { SupportedDocJson } from '../types'; - -export const constants = { - TYPES_SECTION_NAME: 'types', - EXTERNAL_EXPORTS_SECTION_NAME: 'external exports', - TYPE_TO_SYNTAX: { - [SupportedDocJson.SolDoc]: 'solidity', - [SupportedDocJson.TypeDoc]: 'typescript', - } as { [supportedDocType: string]: string }, -}; diff --git a/packages/react-docs/tsconfig.json b/packages/react-docs/tsconfig.json deleted file mode 100644 index 76e2cd0278..0000000000 --- a/packages/react-docs/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": "src", - "jsx": "react", - "baseUrl": ".", - "strictNullChecks": false, - "paths": { - "*": ["node_modules/@types/*", "*"] - } - }, - "include": ["./src/**/*"] -} diff --git a/packages/react-docs/tslint.json b/packages/react-docs/tslint.json deleted file mode 100644 index c3f6d9cae7..0000000000 --- a/packages/react-docs/tslint.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": ["@0x/tslint-config"], - "rules": { - "no-object-literal-type-assertion": false, - "completed-docs": false, - "prefer-function-over-method": false, - "custom-no-magic-numbers": false - } -} diff --git a/packages/website/package.json b/packages/website/package.json index ea44b849f6..786a57a8a4 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -26,8 +26,7 @@ "@0x/contract-wrappers": "^9.1.7", "@0x/json-schemas": "^3.0.11", "@0x/order-utils": "^8.2.2", - "@0x/react-docs": "^2.0.14", - "@0x/react-shared": "^2.0.14", + "@0x/react-shared": "^2.0.15", "@0x/subproviders": "^4.1.2", "@0x/types": "^2.4.1", "@0x/typescript-typings": "^4.2.4", @@ -78,6 +77,7 @@ "redux-devtools-extension": "^2.13.2", "rollbar": "^2.4.7", "semver-sort": "0.0.4", + "semver": "5.5.0", "styled-components": "^4.1.1", "thenby": "^1.2.3", "truffle-contract": "2.0.1", @@ -85,6 +85,7 @@ "xml-js": "^1.6.4" }, "devDependencies": { + "@0x/tslint-config": "^3.0.1", "@types/accounting": "^0.4.1", "@types/blockies": "^0.0.0", "@types/deep-equal": "^1.0.0", diff --git a/packages/react-docs/src/components/badge.tsx b/packages/website/ts/components/documentation/reference/badge.tsx similarity index 100% rename from packages/react-docs/src/components/badge.tsx rename to packages/website/ts/components/documentation/reference/badge.tsx diff --git a/packages/react-docs/src/components/comment.tsx b/packages/website/ts/components/documentation/reference/comment.tsx similarity index 100% rename from packages/react-docs/src/components/comment.tsx rename to packages/website/ts/components/documentation/reference/comment.tsx diff --git a/packages/react-docs/src/components/custom_enum.tsx b/packages/website/ts/components/documentation/reference/custom_enum.tsx similarity index 100% rename from packages/react-docs/src/components/custom_enum.tsx rename to packages/website/ts/components/documentation/reference/custom_enum.tsx diff --git a/packages/react-docs/src/components/doc_reference.tsx b/packages/website/ts/components/documentation/reference/doc_reference.tsx similarity index 98% rename from packages/react-docs/src/components/doc_reference.tsx rename to packages/website/ts/components/documentation/reference/doc_reference.tsx index 0b1842b40c..755584b6fb 100644 --- a/packages/react-docs/src/components/doc_reference.tsx +++ b/packages/website/ts/components/documentation/reference/doc_reference.tsx @@ -23,9 +23,9 @@ import * as _ from 'lodash'; import * as React from 'react'; import * as semver from 'semver'; -import { DocsInfo } from '../docs_info'; -import { AddressByContractName, SupportedDocJson } from '../types'; -import { constants } from '../utils/constants'; +import { AddressByContractName, SupportedDocJson } from '../../../types'; +import { constants } from '../../../utils/constants'; +import { DocsInfo } from '../../../utils/docs_info'; import { Badge } from './badge'; import { Comment } from './comment'; diff --git a/packages/react-docs/src/components/enum.tsx b/packages/website/ts/components/documentation/reference/enum.tsx similarity index 92% rename from packages/react-docs/src/components/enum.tsx rename to packages/website/ts/components/documentation/reference/enum.tsx index f8fdefcfbc..a30efea25b 100644 --- a/packages/react-docs/src/components/enum.tsx +++ b/packages/website/ts/components/documentation/reference/enum.tsx @@ -1,7 +1,7 @@ import * as _ from 'lodash'; import * as React from 'react'; -import { EnumValue } from '../types'; +import { EnumValue } from '../../../types'; export interface EnumProps { values: EnumValue[]; diff --git a/packages/react-docs/src/components/event_definition.tsx b/packages/website/ts/components/documentation/reference/event_definition.tsx similarity index 98% rename from packages/react-docs/src/components/event_definition.tsx rename to packages/website/ts/components/documentation/reference/event_definition.tsx index b767697888..0b11692d3f 100644 --- a/packages/react-docs/src/components/event_definition.tsx +++ b/packages/website/ts/components/documentation/reference/event_definition.tsx @@ -3,7 +3,7 @@ import { Event, EventArg } from '@0x/types'; import * as _ from 'lodash'; import * as React from 'react'; -import { DocsInfo } from '../docs_info'; +import { DocsInfo } from '../../../utils/docs_info'; import { Type } from './type'; diff --git a/packages/react-docs/src/components/interface.tsx b/packages/website/ts/components/documentation/reference/interface.tsx similarity index 98% rename from packages/react-docs/src/components/interface.tsx rename to packages/website/ts/components/documentation/reference/interface.tsx index b823a62e15..5548d6f595 100644 --- a/packages/react-docs/src/components/interface.tsx +++ b/packages/website/ts/components/documentation/reference/interface.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import { CustomType, TypeDefinitionByName } from '@0x/types'; -import { DocsInfo } from '../docs_info'; +import { DocsInfo } from '../../../utils/docs_info'; import { Signature } from './signature'; import { Type } from './type'; diff --git a/packages/react-docs/src/components/property_block.tsx b/packages/website/ts/components/documentation/reference/property_block.tsx similarity index 96% rename from packages/react-docs/src/components/property_block.tsx rename to packages/website/ts/components/documentation/reference/property_block.tsx index d0bd84802b..9932161ce5 100644 --- a/packages/react-docs/src/components/property_block.tsx +++ b/packages/website/ts/components/documentation/reference/property_block.tsx @@ -2,8 +2,8 @@ import { AnchorTitle, HeaderSizes } from '@0x/react-shared'; import { Property, TypeDefinitionByName } from '@0x/types'; import * as React from 'react'; -import { DocsInfo } from '../docs_info'; -import { constants } from '../utils/constants'; +import { constants } from '../../../utils/constants'; +import { DocsInfo } from '../../../utils/docs_info'; import { Comment } from './comment'; import { SourceLink } from './source_link'; diff --git a/packages/react-docs/src/components/signature.tsx b/packages/website/ts/components/documentation/reference/signature.tsx similarity index 98% rename from packages/react-docs/src/components/signature.tsx rename to packages/website/ts/components/documentation/reference/signature.tsx index db55976a11..b068b4ecf0 100644 --- a/packages/react-docs/src/components/signature.tsx +++ b/packages/website/ts/components/documentation/reference/signature.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import { Parameter, Type as TypeDef, TypeDefinitionByName, TypeParameter } from '@0x/types'; -import { DocsInfo } from '../docs_info'; +import { DocsInfo } from '../../../utils/docs_info'; import { Type } from './type'; diff --git a/packages/react-docs/src/components/signature_block.tsx b/packages/website/ts/components/documentation/reference/signature_block.tsx similarity index 98% rename from packages/react-docs/src/components/signature_block.tsx rename to packages/website/ts/components/documentation/reference/signature_block.tsx index 320390a365..20a08a9cca 100644 --- a/packages/react-docs/src/components/signature_block.tsx +++ b/packages/website/ts/components/documentation/reference/signature_block.tsx @@ -3,8 +3,8 @@ import { Parameter, SolidityMethod, TypeDefinitionByName, TypescriptFunction, Ty import * as _ from 'lodash'; import * as React from 'react'; -import { DocsInfo } from '../docs_info'; -import { constants } from '../utils/constants'; +import { constants } from '../../../utils/constants'; +import { DocsInfo } from '../../../utils/docs_info'; import { Comment } from './comment'; import { Signature } from './signature'; diff --git a/packages/react-docs/src/components/source_link.tsx b/packages/website/ts/components/documentation/reference/source_link.tsx similarity index 100% rename from packages/react-docs/src/components/source_link.tsx rename to packages/website/ts/components/documentation/reference/source_link.tsx diff --git a/packages/react-docs/src/components/type.tsx b/packages/website/ts/components/documentation/reference/type.tsx similarity index 99% rename from packages/react-docs/src/components/type.tsx rename to packages/website/ts/components/documentation/reference/type.tsx index 99556f0b95..e04624d534 100644 --- a/packages/react-docs/src/components/type.tsx +++ b/packages/website/ts/components/documentation/reference/type.tsx @@ -5,7 +5,7 @@ import * as _ from 'lodash'; import * as React from 'react'; import * as ReactTooltip from 'react-tooltip'; -import { DocsInfo } from '../docs_info'; +import { DocsInfo } from '../../../utils/docs_info'; import { Signature } from './signature'; import { TypeDefinition } from './type_definition'; diff --git a/packages/react-docs/src/components/type_definition.tsx b/packages/website/ts/components/documentation/reference/type_definition.tsx similarity index 97% rename from packages/react-docs/src/components/type_definition.tsx rename to packages/website/ts/components/documentation/reference/type_definition.tsx index a1fde51dae..1b59d383e0 100644 --- a/packages/react-docs/src/components/type_definition.tsx +++ b/packages/website/ts/components/documentation/reference/type_definition.tsx @@ -4,9 +4,9 @@ import { errorUtils } from '@0x/utils'; import * as _ from 'lodash'; import * as React from 'react'; -import { DocsInfo } from '../docs_info'; -import { KindString, SupportedDocJson } from '../types'; -import { constants } from '../utils/constants'; +import { KindString, SupportedDocJson } from '../../../types'; +import { constants } from '../../../utils/constants'; +import { DocsInfo } from '../../../utils/docs_info'; import { Comment } from './comment'; import { CustomEnum } from './custom_enum'; diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx index d5967cd1db..d88f6e99b6 100644 --- a/packages/website/ts/components/top_bar/top_bar.tsx +++ b/packages/website/ts/components/top_bar/top_bar.tsx @@ -1,4 +1,3 @@ -import { DocsInfo } from '@0x/react-docs'; import { ALink, colors, Link, Styles } from '@0x/react-shared'; import { ObjectMap } from '@0x/types'; import * as _ from 'lodash'; @@ -16,6 +15,8 @@ import { Deco, Key, ProviderType, WebsitePaths } from 'ts/types'; import { constants } from 'ts/utils/constants'; import { Translate } from 'ts/utils/translate'; +import { DocsInfo } from '../../utils/docs_info'; + export enum TopBarDisplayType { Default, Expanded, diff --git a/packages/website/ts/containers/asset_buyer_documentation.ts b/packages/website/ts/containers/asset_buyer_documentation.ts index a75c6d861b..16420f63f2 100644 --- a/packages/website/ts/containers/asset_buyer_documentation.ts +++ b/packages/website/ts/containers/asset_buyer_documentation.ts @@ -1,9 +1,9 @@ -import { DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; import { DocPackages } from 'ts/types'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; /* tslint:disable:no-var-requires */ diff --git a/packages/website/ts/containers/connect_documentation.ts b/packages/website/ts/containers/connect_documentation.ts index 1cfc0702ee..a28e476f6b 100644 --- a/packages/website/ts/containers/connect_documentation.ts +++ b/packages/website/ts/containers/connect_documentation.ts @@ -1,9 +1,9 @@ -import { DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; import { DocPackages } from 'ts/types'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; /* tslint:disable:no-var-requires */ diff --git a/packages/website/ts/containers/contract_wrappers_documentation.ts b/packages/website/ts/containers/contract_wrappers_documentation.ts index bbabce7a72..f9b5cdcca4 100644 --- a/packages/website/ts/containers/contract_wrappers_documentation.ts +++ b/packages/website/ts/containers/contract_wrappers_documentation.ts @@ -1,9 +1,9 @@ -import { DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; import { DocPackages } from 'ts/types'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; /* tslint:disable:no-var-requires */ diff --git a/packages/website/ts/containers/ethereum_types_documentation.ts b/packages/website/ts/containers/ethereum_types_documentation.ts index e6e4d4067b..9dcde324ab 100644 --- a/packages/website/ts/containers/ethereum_types_documentation.ts +++ b/packages/website/ts/containers/ethereum_types_documentation.ts @@ -1,9 +1,10 @@ -import { constants as docConstants, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; import { DocPackages } from 'ts/types'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; +import { constants } from '../utils/constants'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; /* tslint:disable:no-var-requires */ @@ -14,7 +15,7 @@ const InstallationMarkdown = require('md/docs/ethereum_types/installation'); const markdownSections = { introduction: 'introduction', installation: 'installation', - types: docConstants.TYPES_SECTION_NAME, + types: constants.TYPES_SECTION_NAME, }; const docsInfoConfig: DocsInfoConfig = { diff --git a/packages/website/ts/containers/json_schemas_documentation.ts b/packages/website/ts/containers/json_schemas_documentation.ts index 1090265e7c..d4dc6f00af 100644 --- a/packages/website/ts/containers/json_schemas_documentation.ts +++ b/packages/website/ts/containers/json_schemas_documentation.ts @@ -1,9 +1,9 @@ -import { DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; import { DocPackages } from 'ts/types'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; /* tslint:disable:no-var-requires */ diff --git a/packages/website/ts/containers/migrations_documentation.ts b/packages/website/ts/containers/migrations_documentation.ts index bae84dfeaa..07237e5690 100644 --- a/packages/website/ts/containers/migrations_documentation.ts +++ b/packages/website/ts/containers/migrations_documentation.ts @@ -1,4 +1,3 @@ -import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import * as React from 'react'; import { connect } from 'react-redux'; import { Dispatch } from 'redux'; @@ -8,6 +7,9 @@ import { State } from 'ts/redux/reducer'; import { DocPackages, ScreenWidths } from 'ts/types'; import { Translate } from 'ts/utils/translate'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; +import { DocsInfo } from '../utils/docs_info'; + /* tslint:disable:no-var-requires */ const IntroMarkdown1 = require('md/docs/migrations/1/introduction'); const InstallationMarkdown1 = require('md/docs/migrations/1/installation'); diff --git a/packages/website/ts/containers/order_utils_documentation.ts b/packages/website/ts/containers/order_utils_documentation.ts index 8d83357ca7..288f45c518 100644 --- a/packages/website/ts/containers/order_utils_documentation.ts +++ b/packages/website/ts/containers/order_utils_documentation.ts @@ -1,9 +1,9 @@ -import { DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; import { DocPackages } from 'ts/types'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; /* tslint:disable:no-var-requires */ diff --git a/packages/website/ts/containers/order_watcher_documentation.ts b/packages/website/ts/containers/order_watcher_documentation.ts index 149ffdd2af..f82947c3a6 100644 --- a/packages/website/ts/containers/order_watcher_documentation.ts +++ b/packages/website/ts/containers/order_watcher_documentation.ts @@ -1,9 +1,9 @@ -import { DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; import { DocPackages } from 'ts/types'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; /* tslint:disable:no-var-requires */ diff --git a/packages/website/ts/containers/smart_contracts_documentation.ts b/packages/website/ts/containers/smart_contracts_documentation.ts index d94e285a74..f0413de3e6 100644 --- a/packages/website/ts/containers/smart_contracts_documentation.ts +++ b/packages/website/ts/containers/smart_contracts_documentation.ts @@ -1,10 +1,10 @@ -import { DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import { Networks } from '@0x/react-shared'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; import { DocPackages, SmartContractDocSections as Sections } from 'ts/types'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; /* tslint:disable:no-var-requires */ diff --git a/packages/website/ts/containers/sol_compiler_documentation.ts b/packages/website/ts/containers/sol_compiler_documentation.ts index 31117372b4..3788b414a4 100644 --- a/packages/website/ts/containers/sol_compiler_documentation.ts +++ b/packages/website/ts/containers/sol_compiler_documentation.ts @@ -1,9 +1,9 @@ -import { DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; import { DocPackages } from 'ts/types'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; /* tslint:disable:no-var-requires */ diff --git a/packages/website/ts/containers/sol_coverage_documentation.ts b/packages/website/ts/containers/sol_coverage_documentation.ts index a9073b7200..9b8781fef2 100644 --- a/packages/website/ts/containers/sol_coverage_documentation.ts +++ b/packages/website/ts/containers/sol_coverage_documentation.ts @@ -1,9 +1,9 @@ -import { DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; import { DocPackages } from 'ts/types'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; /* tslint:disable:no-var-requires */ diff --git a/packages/website/ts/containers/sol_profiler_documentation.ts b/packages/website/ts/containers/sol_profiler_documentation.ts index 2f3936cae1..e2f5ea2611 100644 --- a/packages/website/ts/containers/sol_profiler_documentation.ts +++ b/packages/website/ts/containers/sol_profiler_documentation.ts @@ -1,9 +1,9 @@ -import { DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; import { DocPackages } from 'ts/types'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; /* tslint:disable:no-var-requires */ diff --git a/packages/website/ts/containers/sol_trace_documentation.ts b/packages/website/ts/containers/sol_trace_documentation.ts index 9c25524385..7275d65dbe 100644 --- a/packages/website/ts/containers/sol_trace_documentation.ts +++ b/packages/website/ts/containers/sol_trace_documentation.ts @@ -1,9 +1,9 @@ -import { DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; import { DocPackages } from 'ts/types'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; /* tslint:disable:no-var-requires */ diff --git a/packages/website/ts/containers/subproviders_documentation.ts b/packages/website/ts/containers/subproviders_documentation.ts index 2ac0360abc..23c70cca14 100644 --- a/packages/website/ts/containers/subproviders_documentation.ts +++ b/packages/website/ts/containers/subproviders_documentation.ts @@ -1,9 +1,9 @@ -import { DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; import { DocPackages } from 'ts/types'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; /* tslint:disable:no-var-requires */ diff --git a/packages/website/ts/containers/web3_wrapper_documentation.ts b/packages/website/ts/containers/web3_wrapper_documentation.ts index 73fea90ede..76539e73a7 100644 --- a/packages/website/ts/containers/web3_wrapper_documentation.ts +++ b/packages/website/ts/containers/web3_wrapper_documentation.ts @@ -1,9 +1,9 @@ -import { DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; import { DocPackages } from 'ts/types'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; /* tslint:disable:no-var-requires */ diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts index 0e47656567..737740a6b9 100644 --- a/packages/website/ts/containers/zero_ex_js_documentation.ts +++ b/packages/website/ts/containers/zero_ex_js_documentation.ts @@ -1,9 +1,9 @@ -import { DocsInfoConfig, SupportedDocJson } from '@0x/react-docs'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; import { DocPackages } from 'ts/types'; +import { DocsInfoConfig, SupportedDocJson } from '../types'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; /* tslint:disable:no-var-requires */ diff --git a/packages/website/ts/pages/documentation/doc_page.tsx b/packages/website/ts/pages/documentation/doc_page.tsx index 7430f7fb10..fad56bccfe 100644 --- a/packages/website/ts/pages/documentation/doc_page.tsx +++ b/packages/website/ts/pages/documentation/doc_page.tsx @@ -1,11 +1,4 @@ -import { - DocAgnosticFormat, - DocReference, - DocsInfo, - GeneratedDocJson, - SupportedDocJson, - TypeDocUtils, -} from '@0x/react-docs'; +import { DocAgnosticFormat, GeneratedDocJson } from '@0x/types'; import findVersions from 'find-versions'; import * as _ from 'lodash'; import CircularProgress from 'material-ui/CircularProgress'; @@ -22,6 +15,11 @@ import { docUtils } from 'ts/utils/doc_utils'; import { Translate } from 'ts/utils/translate'; import { utils } from 'ts/utils/utils'; +import { DocReference } from '../../components/documentation/reference/doc_reference'; +import { SupportedDocJson } from '../../types'; +import { DocsInfo } from '../../utils/docs_info'; +import { TypeDocUtils } from '../../utils/typedoc_utils'; + const isDevelopmentOrStaging = utils.isDevelopment() || utils.isStaging(); const ZERO_EX_JS_VERSION_MISSING_TOPLEVEL_PATH = '0.32.4'; diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts index ffe1478309..64d2e94c49 100644 --- a/packages/website/ts/types.ts +++ b/packages/website/ts/types.ts @@ -776,4 +776,71 @@ export interface TallyInterface { no?: BigNumber; blockNumber?: string; } + +export interface SectionNameToMarkdownByVersion { + [version: string]: { [sectionName: string]: string }; +} + +export interface DocsInfoConfig { + id: string; + packageName: string; + type: SupportedDocJson; + displayName: string; + packageUrl: string; + markdownMenu: DocsMenu; + markdownSections: SectionsMap; + sectionNameToMarkdownByVersion: SectionNameToMarkdownByVersion; + contractsByVersionByNetworkId?: ContractsByVersionByNetworkId; +} + +export interface DocsMenu { + [sectionName: string]: string[]; +} + +export interface SectionsMap { + [sectionName: string]: string; +} + +// Exception: We don't make the values uppercase because these KindString's need to +// match up those returned by TypeDoc +export enum KindString { + Constructor = 'Constructor', + Property = 'Property', + Method = 'Method', + Interface = 'Interface', + TypeAlias = 'Type alias', + ObjectLiteral = 'Object literal', + Variable = 'Variable', + Function = 'Function', + Enumeration = 'Enumeration', + Class = 'Class', +} + +export enum SupportedDocJson { + SolDoc = 'SOL_DOC', + TypeDoc = 'TYPEDOC', +} + +export interface ContractsByVersionByNetworkId { + [version: string]: { + [networkName: string]: { + [contractName: string]: string; + }; + }; +} + +export interface AddressByContractName { + [contractName: string]: string; +} + +export interface EnumValue { + name: string; + defaultValue?: string; +} + +export enum AbiTypes { + Constructor = 'constructor', + Function = 'function', + Event = 'event', +} // tslint:disable:max-file-line-count diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts index 9b6475f537..558f589846 100644 --- a/packages/website/ts/utils/constants.ts +++ b/packages/website/ts/utils/constants.ts @@ -2,6 +2,8 @@ import { ALink } from '@0x/react-shared'; import { BigNumber } from '@0x/utils'; import { Key, WebsitePaths } from 'ts/types'; +import { SupportedDocJson } from '../types'; + const URL_FORUM = 'https://forum.0x.org'; const URL_ZEROEX_CHAT = 'https://discord.gg/d3FTX3M'; @@ -132,4 +134,10 @@ export const constants = { shouldOpenInNewTab: true, }, ] as ALink[], + TYPES_SECTION_NAME: 'types', + EXTERNAL_EXPORTS_SECTION_NAME: 'external exports', + TYPE_TO_SYNTAX: { + [SupportedDocJson.SolDoc]: 'solidity', + [SupportedDocJson.TypeDoc]: 'typescript', + } as { [supportedDocType: string]: string }, }; diff --git a/packages/website/ts/utils/doc_utils.ts b/packages/website/ts/utils/doc_utils.ts index 6be164e6ee..eeda910120 100644 --- a/packages/website/ts/utils/doc_utils.ts +++ b/packages/website/ts/utils/doc_utils.ts @@ -1,4 +1,4 @@ -import { DocAgnosticFormat, GeneratedDocJson } from '@0x/react-docs'; +import { DocAgnosticFormat, GeneratedDocJson } from '@0x/types'; import { fetchAsync, logUtils } from '@0x/utils'; import * as _ from 'lodash'; import { S3FileObject, VersionToFilePath } from 'ts/types'; diff --git a/packages/react-docs/src/docs_info.ts b/packages/website/ts/utils/docs_info.ts similarity index 98% rename from packages/react-docs/src/docs_info.ts rename to packages/website/ts/utils/docs_info.ts index 70fdb42350..1317129a6c 100644 --- a/packages/react-docs/src/docs_info.ts +++ b/packages/website/ts/utils/docs_info.ts @@ -9,8 +9,9 @@ import { SectionNameToMarkdownByVersion, SectionsMap, SupportedDocJson, -} from './types'; -import { constants } from './utils/constants'; +} from '../types'; + +import { constants } from './constants'; export class DocsInfo { public id: string; diff --git a/packages/website/ts/utils/documentation_container.ts b/packages/website/ts/utils/documentation_container.ts index 54e8a2c1ab..df86ccf043 100644 --- a/packages/website/ts/utils/documentation_container.ts +++ b/packages/website/ts/utils/documentation_container.ts @@ -1,11 +1,12 @@ -import { DocsInfo, DocsInfoConfig } from '@0x/react-docs'; import { Dispatch } from 'redux'; import { DocPageProps } from 'ts/pages/documentation/doc_page'; import { Dispatcher } from 'ts/redux/dispatcher'; import { State } from 'ts/redux/reducer'; -import { ScreenWidths } from 'ts/types'; +import { DocsInfoConfig, ScreenWidths } from 'ts/types'; import { Translate } from 'ts/utils/translate'; +import { DocsInfo } from 'ts/utils/docs_info'; + export interface ConnectedState { docsVersion: string; availableDocVersions: string[]; diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/website/ts/utils/typedoc_utils.ts similarity index 99% rename from packages/react-docs/src/utils/typedoc_utils.ts rename to packages/website/ts/utils/typedoc_utils.ts index 0557a470fb..054bf0563d 100644 --- a/packages/react-docs/src/utils/typedoc_utils.ts +++ b/packages/website/ts/utils/typedoc_utils.ts @@ -20,10 +20,10 @@ import { import { errorUtils } from '@0x/utils'; import * as _ from 'lodash'; -import { DocsInfo } from '../docs_info'; import { KindString } from '../types'; import { constants } from './constants'; +import { DocsInfo } from './docs_info'; export class TypeDocUtils { private readonly _typeDocNameOrder: string[]; diff --git a/tsconfig.json b/tsconfig.json index 4d563d3116..6e723a7f37 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -50,7 +50,6 @@ { "path": "./packages/monorepo-scripts" }, { "path": "./packages/order-utils" }, { "path": "./packages/order-watcher" }, - { "path": "./packages/react-docs" }, { "path": "./packages/react-shared" }, { "path": "./packages/sol-compiler" }, { "path": "./packages/sol-coverage" }, diff --git a/yarn.lock b/yarn.lock index 1bb3183d1f..68d9fdb908 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1726,9 +1726,12 @@ version "0.22.9" resolved "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.9.tgz#b5990152604c2ada749b7f88cab3476f21f39d7b" -"@types/compare-versions@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/compare-versions/-/compare-versions-3.0.0.tgz#4a45dffe0ebbc00d0f2daef8a0e96ffc66cf5955" +"@types/chokidar@^1.7.5": + version "1.7.5" + resolved "https://registry.yarnpkg.com/@types/chokidar/-/chokidar-1.7.5.tgz#1fa78c8803e035bed6d98e6949e514b133b0c9b6" + dependencies: + "@types/events" "*" + "@types/node" "*" "@types/deep-equal@^1.0.0": version "1.0.1" @@ -5011,10 +5014,6 @@ compare-func@^1.3.1: array-ify "^1.0.0" dot-prop "^3.0.0" -compare-versions@^3.0.1: - version "3.1.0" - resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.1.0.tgz#43310256a5c555aaed4193c04d8f154cf9c6efd5" - component-classes@^1.2.5: version "1.2.6" resolved "https://registry.yarnpkg.com/component-classes/-/component-classes-1.2.6.tgz#c642394c3618a4d8b0b8919efccbbd930e5cd691" From ec7f9d8a63152e44da398b81140d314ec09034a3 Mon Sep 17 00:00:00 2001 From: fabioberger Date: Thu, 25 Jul 2019 11:18:42 +0200 Subject: [PATCH 2/4] Remove react-shared package and fold it into website --- .github/autolabeler.yml | 1 - packages/dev-tools-pages/package.json | 1 - packages/react-shared/.npmignore | 9 - packages/react-shared/CHANGELOG.json | 506 ------------------ packages/react-shared/CHANGELOG.md | 228 -------- packages/react-shared/README.md | 63 --- packages/react-shared/package.json | 66 --- packages/react-shared/src/globals.d.ts | 6 - packages/react-shared/src/index.ts | 12 - packages/react-shared/src/types.ts | 33 -- packages/react-shared/src/utils/constants.ts | 19 - packages/react-shared/src/utils/utils.ts | 52 -- packages/react-shared/tsconfig.json | 13 - packages/react-shared/tslint.json | 9 - packages/website/package.json | 7 +- packages/website/ts/blockchain.ts | 20 +- .../dialogs/blockchain_err_dialog.tsx | 4 +- .../dialogs/eth_weth_conversion_dialog.tsx | 2 +- .../dialogs/ledger_config_dialog.tsx | 6 +- .../dialogs/portal_disclaimer_dialog.tsx | 2 +- .../ts/components/documentation/.DS_Store | Bin 0 -> 6148 bytes .../ts/components/documentation/docs_logo.tsx | 2 +- .../components/documentation/docs_top_bar.tsx | 5 +- .../documentation/overview_content.tsx | 9 +- .../documentation/reference/badge.tsx | 2 +- .../documentation/reference/comment.tsx | 3 +- .../documentation/reference/doc_reference.tsx | 30 +- .../documentation/reference/enum.tsx | 2 +- .../reference/event_definition.tsx | 6 +- .../documentation/reference/interface.tsx | 2 +- .../reference/property_block.tsx | 7 +- .../documentation/reference/signature.tsx | 2 +- .../reference/signature_block.tsx | 8 +- .../documentation/reference/source_link.tsx | 4 +- .../documentation/reference/type.tsx | 8 +- .../reference/type_definition.tsx | 9 +- .../components/documentation/shared/.DS_Store | Bin 0 -> 6148 bytes .../documentation/shared}/anchor_title.tsx | 7 +- .../components/documentation/shared}/link.tsx | 4 +- .../shared}/markdown_code_block.tsx | 0 .../shared}/markdown_link_block.tsx | 4 +- .../shared}/markdown_paragraph_block.tsx | 2 +- .../shared}/markdown_section.tsx | 6 +- .../documentation/shared}/section_header.tsx | 6 +- .../documentation/sidebar_header.tsx | 2 +- .../documentation/tutorial_button.tsx | 5 +- .../documentation/version_drop_down.tsx | 2 +- .../dropdowns/developers_drop_down.tsx | 6 +- .../dropdowns/dropdown_developers.tsx | 4 +- .../dropdowns/dropdown_resources.tsx | 4 +- .../dropdowns/network_drop_down.tsx | 4 +- .../website/ts/components/eth_wrappers.tsx | 7 +- packages/website/ts/components/fill_order.tsx | 4 +- .../ts/components/fill_warning_dialog.tsx | 2 +- .../flash_messages/asset_send_completed.tsx | 2 +- .../flash_messages/transaction_submitted.tsx | 2 +- packages/website/ts/components/footer.tsx | 2 +- .../generate_order/generate_order_form.tsx | 2 +- .../generate_order/new_token_form.tsx | 2 +- packages/website/ts/components/header.tsx | 2 +- .../ts/components/inputs/address_input.tsx | 2 +- .../inputs/allowance_state_toggle.tsx | 2 +- .../inputs/balance_bounded_input.tsx | 2 +- .../ts/components/inputs/hash_input.tsx | 3 +- .../components/inputs/token_amount_input.tsx | 3 +- .../ts/components/inputs/token_input.tsx | 2 +- packages/website/ts/components/link.tsx | 2 +- .../ts/components/nested_sidebar_menu.tsx | 11 +- packages/website/ts/components/old_footer.tsx | 6 +- .../install_wallet_onboarding_step.tsx | 2 +- .../components/onboarding/onboarding_card.tsx | 2 +- .../onboarding/wrap_eth_onboarding_step.tsx | 2 +- .../ts/components/portal/back_button.tsx | 3 +- .../ts/components/portal/drawer_menu.tsx | 3 +- .../website/ts/components/portal/menu.tsx | 3 +- .../website/ts/components/portal/portal.tsx | 3 +- .../ts/components/portal/text_header.tsx | 2 +- .../relayer_index/relayer_grid_tile.tsx | 3 +- .../relayer_index/relayer_top_tokens.tsx | 6 +- .../website/ts/components/token_balances.tsx | 18 +- .../components/top_bar/provider_display.tsx | 3 +- .../website/ts/components/top_bar/top_bar.tsx | 6 +- .../components/top_bar/top_bar_menu_item.tsx | 3 +- .../components/track_token_confirmation.tsx | 2 +- .../trade_history/trade_history_item.tsx | 4 +- packages/website/ts/components/ui/alert.tsx | 2 +- .../ts/components/ui/allowance_state_view.tsx | 2 +- packages/website/ts/components/ui/button.tsx | 2 +- .../website/ts/components/ui/check_mark.tsx | 2 +- .../website/ts/components/ui/copy_icon.tsx | 2 +- .../ts/components/ui/custom_menu_item.tsx | 2 +- .../ts/components/ui/ethereum_address.tsx | 2 +- .../ts/components/ui/etherscan_icon.tsx | 6 +- .../ts/components/ui/fake_text_field.tsx | 2 +- .../website/ts/components/ui/icon_button.tsx | 3 +- .../website/ts/components/ui/input_label.tsx | 3 +- .../components/ui/lifecycle_raised_button.tsx | 2 +- .../website/ts/components/ui/multi_select.tsx | 2 +- packages/website/ts/components/ui/party.tsx | 6 +- packages/website/ts/components/ui/pointer.tsx | 2 +- .../ts/components/ui/required_label.tsx | 2 +- .../website/ts/components/ui/simple_menu.tsx | 2 +- packages/website/ts/components/ui/spinner.tsx | 2 +- .../website/ts/components/ui/swap_icon.tsx | 2 +- packages/website/ts/components/ui/text.tsx | 2 +- .../website/ts/components/wallet/wallet.tsx | 6 +- .../ts/components/wallet/wrap_ether_item.tsx | 3 +- .../smart_contracts_documentation.ts | 3 +- .../pages/documentation/developers_page.tsx | 5 +- .../ts/pages/documentation/docs_home.tsx | 6 +- packages/website/ts/pages/faq/faq.tsx | 4 +- packages/website/ts/pages/faq/question.tsx | 2 +- packages/website/ts/pages/instant.tsx | 5 +- packages/website/ts/pages/wiki/wiki.tsx | 18 +- packages/website/ts/style/colors.ts | 2 +- packages/website/ts/types.ts | 34 +- .../src => website/ts}/utils/colors.ts | 0 packages/website/ts/utils/constants.ts | 18 +- packages/website/ts/utils/docs_info.ts | 5 +- packages/website/ts/utils/mui_theme.ts | 2 +- packages/website/ts/utils/utils.ts | 53 +- yarn.lock | 227 +------- 122 files changed, 322 insertions(+), 1458 deletions(-) delete mode 100644 packages/react-shared/.npmignore delete mode 100644 packages/react-shared/CHANGELOG.json delete mode 100644 packages/react-shared/CHANGELOG.md delete mode 100644 packages/react-shared/README.md delete mode 100644 packages/react-shared/package.json delete mode 100644 packages/react-shared/src/globals.d.ts delete mode 100644 packages/react-shared/src/index.ts delete mode 100644 packages/react-shared/src/types.ts delete mode 100644 packages/react-shared/src/utils/constants.ts delete mode 100644 packages/react-shared/src/utils/utils.ts delete mode 100644 packages/react-shared/tsconfig.json delete mode 100644 packages/react-shared/tslint.json create mode 100644 packages/website/ts/components/documentation/.DS_Store create mode 100644 packages/website/ts/components/documentation/shared/.DS_Store rename packages/{react-shared/src/components => website/ts/components/documentation/shared}/anchor_title.tsx (93%) rename packages/{react-shared/src/components => website/ts/components/documentation/shared}/link.tsx (98%) rename packages/{react-shared/src/components => website/ts/components/documentation/shared}/markdown_code_block.tsx (100%) rename packages/{react-shared/src/components => website/ts/components/documentation/shared}/markdown_link_block.tsx (95%) rename packages/{react-shared/src/components => website/ts/components/documentation/shared}/markdown_paragraph_block.tsx (90%) rename packages/{react-shared/src/components => website/ts/components/documentation/shared}/markdown_section.tsx (97%) rename packages/{react-shared/src/components => website/ts/components/documentation/shared}/section_header.tsx (94%) rename packages/{react-shared/src => website/ts}/utils/colors.ts (100%) diff --git a/.github/autolabeler.yml b/.github/autolabeler.yml index cf40d91812..93de7be30b 100644 --- a/.github/autolabeler.yml +++ b/.github/autolabeler.yml @@ -23,7 +23,6 @@ contracts: ['contracts'] @0x/asset-buyer: ['packages/asset-buyer'] @0x/order-watcher: ['packages/order-watcher'] @0x/order-utils: ['packages/order-utils'] -@0x/react-shared: ['packages/react-shared'] @0x/assert: ['packages/assert'] @0x/base-contract: ['packages/base-contract'] @0x/typescript-typings: ['packages/typescript-typings'] diff --git a/packages/dev-tools-pages/package.json b/packages/dev-tools-pages/package.json index 5bbfed010b..03f093b874 100644 --- a/packages/dev-tools-pages/package.json +++ b/packages/dev-tools-pages/package.json @@ -27,7 +27,6 @@ }, "license": "Apache-2.0", "dependencies": { - "@0x/react-shared": "^2.0.14", "basscss": "^8.0.3", "bowser": "^1.9.4", "highlight.js": "^9.13.1", diff --git a/packages/react-shared/.npmignore b/packages/react-shared/.npmignore deleted file mode 100644 index ea588d4859..0000000000 --- a/packages/react-shared/.npmignore +++ /dev/null @@ -1,9 +0,0 @@ -# Blacklist all files -.* -* -# Whitelist lib -!lib/**/* -# Blacklist tests and publish scripts -/lib/test/* -/lib/monorepo_scripts/ -# Package specific ignore diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json deleted file mode 100644 index be35ad9d9b..0000000000 --- a/packages/react-shared/CHANGELOG.json +++ /dev/null @@ -1,506 +0,0 @@ -[ - { - "timestamp": 1563957393, - "version": "2.0.15", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1563047529, - "version": "2.0.14", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1563006338, - "version": "2.0.13", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1558712885, - "version": "2.0.12", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1557507213, - "version": "2.0.11", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "2.0.10", - "changes": [ - { - "note": "Dependencies updated" - } - ], - "timestamp": 1554997931 - }, - { - "timestamp": 1553183790, - "version": "2.0.9", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1553091633, - "version": "2.0.8", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1551479279, - "version": "2.0.7", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1551220833, - "version": "2.0.6", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1551130135, - "version": "2.0.5", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1549733923, - "version": "2.0.4", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "2.0.3", - "changes": [ - { - "note": "Dependencies updated" - } - ], - "timestamp": 1549547375 - }, - { - "timestamp": 1549504360, - "version": "2.0.2", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1549452781, - "version": "2.0.1", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "2.0.0", - "changes": [ - { - "note": "Upgrade the bignumber.js to v8.0.2", - "pr": 1517 - } - ], - "timestamp": 1549373905 - }, - { - "timestamp": 1547561734, - "version": "1.1.2", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1547225310, - "version": "1.1.1", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "1.1.0", - "changes": [ - { - "note": "Change implementation to use react-router-dom NavLink instead of Link. Expose `activeStyle` prop.", - "pr": 1448 - } - ], - "timestamp": 1547040760 - }, - { - "version": "1.0.25", - "changes": [ - { - "note": "Dependencies updated" - } - ], - "timestamp": 1544739608 - }, - { - "version": "1.0.24", - "changes": [ - { - "note": "Dependencies updated" - } - ], - "timestamp": 1544570656 - }, - { - "timestamp": 1543401373, - "version": "1.0.23", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1542821676, - "version": "1.0.22", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1542208198, - "version": "1.0.21", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1542134075, - "version": "1.0.20", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1542028948, - "version": "1.0.19", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "1.0.18", - "changes": [ - { - "note": "Dependencies updated" - } - ], - "timestamp": 1541740904 - }, - { - "version": "1.0.17", - "changes": [ - { - "note": "Dependencies updated" - } - ], - "timestamp": 1539871071 - }, - { - "timestamp": 1538693146, - "version": "1.0.16", - "changes": [ - { - "note": "Unpublished package" - } - ] - }, - { - "timestamp": 1538475601, - "version": "1.0.14", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1538157789, - "version": "1.0.13", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1537907159, - "version": "1.0.12", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1537875740, - "version": "1.0.11", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1537541580, - "version": "1.0.10", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1536142250, - "version": "1.0.9", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1535377027, - "version": "1.0.8", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1535133899, - "version": "1.0.7", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1534210131, - "version": "1.0.6", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1532619515, - "version": "1.0.5", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1532614997, - "version": "1.0.4", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1532605697, - "version": "1.0.3", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1532551340, - "version": "1.0.2", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1532357734, - "version": "1.0.1", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1532043000, - "version": "1.0.0", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1531919263, - "version": "0.2.3", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1531149657, - "version": "0.2.2", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1529397769, - "version": "0.2.1", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1525477860, - "version": "0.2.0", - "changes": [ - { - "note": "Removed portal specific colors" - } - ] - }, - { - "timestamp": 1525477860, - "version": "0.1.6", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1525466747, - "version": "0.1.5", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1525428773, - "version": "0.1.4", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1524044013, - "version": "0.1.3", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1523462196, - "version": "0.1.2", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1522673609, - "version": "0.1.1", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "0.1.0", - "changes": [ - { - "note": "Added new colors", - "pr": 468 - }, - { - "note": "Fix section and menuItem text display to replace dashes with spaces." - }, - { - "note": "Reorganized colors and added new ones" - } - ], - "timestamp": 1522658513 - } -] diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md deleted file mode 100644 index 9ead479c73..0000000000 --- a/packages/react-shared/CHANGELOG.md +++ /dev/null @@ -1,228 +0,0 @@ - - -CHANGELOG - -## v2.0.15 - _July 24, 2019_ - - * Dependencies updated - -## v2.0.14 - _July 13, 2019_ - - * Dependencies updated - -## v2.0.13 - _July 13, 2019_ - - * Dependencies updated - -## v2.0.12 - _May 24, 2019_ - - * Dependencies updated - -## v2.0.11 - _May 10, 2019_ - - * Dependencies updated - -## v2.0.10 - _April 11, 2019_ - - * Dependencies updated - -## v2.0.9 - _March 21, 2019_ - - * Dependencies updated - -## v2.0.8 - _March 20, 2019_ - - * Dependencies updated - -## v2.0.7 - _March 1, 2019_ - - * Dependencies updated - -## v2.0.6 - _February 26, 2019_ - - * Dependencies updated - -## v2.0.5 - _February 25, 2019_ - - * Dependencies updated - -## v2.0.4 - _February 9, 2019_ - - * Dependencies updated - -## v2.0.3 - _February 7, 2019_ - - * Dependencies updated - -## v2.0.2 - _February 7, 2019_ - - * Dependencies updated - -## v2.0.1 - _February 6, 2019_ - - * Dependencies updated - -## v2.0.0 - _February 5, 2019_ - - * Upgrade the bignumber.js to v8.0.2 (#1517) - -## v1.1.2 - _January 15, 2019_ - - * Dependencies updated - -## v1.1.1 - _January 11, 2019_ - - * Dependencies updated - -## v1.1.0 - _January 9, 2019_ - - * Change implementation to use react-router-dom NavLink instead of Link. Expose `activeStyle` prop. (#1448) - -## v1.0.25 - _December 13, 2018_ - - * Dependencies updated - -## v1.0.24 - _December 11, 2018_ - - * Dependencies updated - -## v1.0.23 - _November 28, 2018_ - - * Dependencies updated - -## v1.0.22 - _November 21, 2018_ - - * Dependencies updated - -## v1.0.21 - _November 14, 2018_ - - * Dependencies updated - -## v1.0.20 - _November 13, 2018_ - - * Dependencies updated - -## v1.0.19 - _November 12, 2018_ - - * Dependencies updated - -## v1.0.18 - _November 9, 2018_ - - * Dependencies updated - -## v1.0.17 - _October 18, 2018_ - - * Dependencies updated - -## v1.0.16 - _October 4, 2018_ - - * Unpublished package - -## v1.0.14 - _October 2, 2018_ - - * Dependencies updated - -## v1.0.13 - _September 28, 2018_ - - * Dependencies updated - -## v1.0.12 - _September 25, 2018_ - - * Dependencies updated - -## v1.0.11 - _September 25, 2018_ - - * Dependencies updated - -## v1.0.10 - _September 21, 2018_ - - * Dependencies updated - -## v1.0.9 - _September 5, 2018_ - - * Dependencies updated - -## v1.0.8 - _August 27, 2018_ - - * Dependencies updated - -## v1.0.7 - _August 24, 2018_ - - * Dependencies updated - -## v1.0.6 - _August 14, 2018_ - - * Dependencies updated - -## v1.0.5 - _July 26, 2018_ - - * Dependencies updated - -## v1.0.4 - _July 26, 2018_ - - * Dependencies updated - -## v1.0.3 - _July 26, 2018_ - - * Dependencies updated - -## v1.0.2 - _July 25, 2018_ - - * Dependencies updated - -## v1.0.1 - _July 23, 2018_ - - * Dependencies updated - -## v1.0.0 - _July 19, 2018_ - - * Dependencies updated - -## v0.2.3 - _July 18, 2018_ - - * Dependencies updated - -## v0.2.2 - _July 9, 2018_ - - * Dependencies updated - -## v0.2.1 - _June 19, 2018_ - - * Dependencies updated - -## v0.2.0 - _May 4, 2018_ - - * Removed portal specific colors - -## v0.1.6 - _May 4, 2018_ - - * Dependencies updated - -## v0.1.5 - _May 4, 2018_ - - * Dependencies updated - -## v0.1.4 - _May 4, 2018_ - - * Dependencies updated - -## v0.1.3 - _April 18, 2018_ - - * Dependencies updated - -## v0.1.2 - _April 11, 2018_ - - * Dependencies updated - -## v0.1.1 - _April 2, 2018_ - - * Dependencies updated - -## v0.1.0 - _April 2, 2018_ - - * Added new colors (#468) - * Fix section and menuItem text display to replace dashes with spaces. - * Reorganized colors and added new ones diff --git a/packages/react-shared/README.md b/packages/react-shared/README.md deleted file mode 100644 index 7ff9a94d90..0000000000 --- a/packages/react-shared/README.md +++ /dev/null @@ -1,63 +0,0 @@ -## @0x/react-shared - -Contains React components & frontend types/utils shared between 0x projects. - -## Installation - -```bash -yarn add @0x/react-shared -``` - -If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: - -```json -"compilerOptions": { - "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], -} -``` - -## Contributing - -We welcome improvements and fixes from the wider community! To report bugs within this package, please create an issue in this repository. - -Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started. - -### Install dependencies - -If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them: - -```bash -yarn config set workspaces-experimental true -``` - -Then install dependencies - -```bash -yarn install -``` - -### Build - -To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: - -```bash -PKG=@0x/react-shared yarn build -``` - -Or continuously rebuild on change: - -```bash -PKG=@0x/react-shared yarn watch -``` - -### Clean - -```bash -yarn clean -``` - -### Lint - -```bash -yarn lint -``` diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json deleted file mode 100644 index 9cf89fda31..0000000000 --- a/packages/react-shared/package.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "name": "@0x/react-shared", - "version": "2.0.15", - "engines": { - "node": ">=6.12" - }, - "description": "0x shared react components", - "main": "lib/index.js", - "types": "lib/index.d.ts", - "scripts": { - "lint": "tslint --format stylish --project .", - "fix": "tslint --fix --format stylish --project .", - "build": "tsc", - "build:ci": "yarn build", - "watch_without_deps": "tsc -w", - "clean": "shx rm -rf lib" - }, - "author": "Fabio Berger", - "license": "Apache-2.0", - "bugs": { - "url": "https://github.com/0xProject/0x-monorepo/issues" - }, - "homepage": "https://github.com/0xProject/0x-monorepo/packages/react-shared/README.md", - "repository": { - "type": "git", - "url": "https://github.com/0xProject/0x-monorepo.git" - }, - "devDependencies": { - "@0x/dev-utils": "^2.2.5", - "@0x/tslint-config": "^3.0.1", - "make-promises-safe": "^1.1.0", - "shx": "^0.2.2", - "tslint": "5.11.0", - "typescript": "3.0.1" - }, - "dependencies": { - "@0x/types": "^2.4.1", - "@material-ui/core": "^3.0.1", - "@types/is-mobile": "0.3.0", - "@types/lodash": "4.14.104", - "@types/material-ui": "^0.20.0", - "@types/node": "*", - "@types/react": "*", - "@types/react-dom": "*", - "@types/react-router-dom": "^4.0.4", - "@types/react-scroll": "1.5.3", - "@types/styled-components": "4.1.1", - "@types/valid-url": "^1.0.2", - "basscss": "^8.0.3", - "change-case": "^3.0.2", - "is-mobile": "^0.2.2", - "lodash": "^4.17.11", - "material-ui": "^0.20.0", - "react": "^16.5.2", - "react-dom": "^16.5.2", - "react-highlight": "0xproject/react-highlight#react-peer-deps", - "react-markdown": "^3.2.2", - "react-router-dom": "^4.3.1", - "react-scroll": "0xproject/react-scroll#pr-330-and-replace-state", - "styled-components": "^4.1.1", - "valid-url": "^1.0.9" - }, - "publishConfig": { - "access": "public" - } -} diff --git a/packages/react-shared/src/globals.d.ts b/packages/react-shared/src/globals.d.ts deleted file mode 100644 index 94e63a32de..0000000000 --- a/packages/react-shared/src/globals.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -declare module '*.json' { - const json: any; - /* tslint:disable */ - export default json; - /* tslint:enable */ -} diff --git a/packages/react-shared/src/index.ts b/packages/react-shared/src/index.ts deleted file mode 100644 index 285e1c6b45..0000000000 --- a/packages/react-shared/src/index.ts +++ /dev/null @@ -1,12 +0,0 @@ -export { AnchorTitle } from './components/anchor_title'; -export { MarkdownLinkBlock } from './components/markdown_link_block'; -export { MarkdownCodeBlock } from './components/markdown_code_block'; -export { MarkdownSection } from './components/markdown_section'; -export { SectionHeader } from './components/section_header'; -export { Link, LinkProps } from './components/link'; - -export { HeaderSizes, Styles, EtherscanLinkSuffixes, Networks, ALink } from './types'; - -export { utils } from './utils/utils'; -export { constants } from './utils/constants'; -export { colors } from './utils/colors'; diff --git a/packages/react-shared/src/types.ts b/packages/react-shared/src/types.ts deleted file mode 100644 index 9e8dcb6b64..0000000000 --- a/packages/react-shared/src/types.ts +++ /dev/null @@ -1,33 +0,0 @@ -export interface Styles { - [name: string]: React.CSSProperties; -} - -export enum HeaderSizes { - H1 = 'h1', - H2 = 'h2', - H3 = 'h3', -} - -export enum EtherscanLinkSuffixes { - Address = 'address', - Tx = 'tx', -} - -export enum Networks { - Mainnet = 'Mainnet', - Kovan = 'Kovan', - Ropsten = 'Ropsten', - Rinkeby = 'Rinkeby', -} - -export enum LinkType { - External = 'EXTERNAL', - ReactScroll = 'REACT_SCROLL', - ReactRoute = 'REACT_ROUTE', -} - -export interface ALink { - title: string; - to: string; - shouldOpenInNewTab?: boolean; -} diff --git a/packages/react-shared/src/utils/constants.ts b/packages/react-shared/src/utils/constants.ts deleted file mode 100644 index 2dca1a078d..0000000000 --- a/packages/react-shared/src/utils/constants.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Networks } from '../types'; - -export const constants = { - DOCS_SCROLL_DURATION_MS: 0, - SCROLL_CONTAINER_ID: 'scroll_container', - SCROLL_TOP_ID: 'pageScrollTop', - NETWORK_NAME_BY_ID: { - 1: Networks.Mainnet, - 3: Networks.Ropsten, - 4: Networks.Rinkeby, - 42: Networks.Kovan, - } as { [symbol: number]: string }, - NETWORK_ID_BY_NAME: { - [Networks.Mainnet]: 1, - [Networks.Ropsten]: 3, - [Networks.Rinkeby]: 4, - [Networks.Kovan]: 42, - } as { [networkName: string]: number }, -}; diff --git a/packages/react-shared/src/utils/utils.ts b/packages/react-shared/src/utils/utils.ts deleted file mode 100644 index 16e7930ede..0000000000 --- a/packages/react-shared/src/utils/utils.ts +++ /dev/null @@ -1,52 +0,0 @@ -import changeCase = require('change-case'); -import isMobile = require('is-mobile'); -import * as _ from 'lodash'; -import { scroller } from 'react-scroll'; - -import { EtherscanLinkSuffixes, Networks } from '../types'; - -import { constants } from './constants'; - -export const utils = { - setUrlHash(anchorId: string): void { - window.location.hash = anchorId; - }, - scrollToHash(hash: string, containerId: string): void { - let finalHash = hash; - if (_.isEmpty(hash)) { - finalHash = constants.SCROLL_TOP_ID; // scroll to the top - } - - scroller.scrollTo(finalHash, { - duration: 0, - offset: 0, - containerId, - }); - }, - isUserOnMobile(): boolean { - const isUserOnMobile = isMobile(); - return isUserOnMobile; - }, - getIdFromName(name: string): string { - const id = name.replace(/ /g, '-'); - return id; - }, - convertDashesToSpaces(text: string): string { - return text.replace(/-/g, ' '); - }, - convertCamelCaseToSpaces(text: string): string { - return changeCase.snake(text).replace(/_/g, ' '); - }, - getEtherScanLinkIfExists( - addressOrTxHash: string, - networkId: number, - suffix: EtherscanLinkSuffixes, - ): string | undefined { - const networkName = constants.NETWORK_NAME_BY_ID[networkId]; - if (networkName === undefined) { - return undefined; - } - const etherScanPrefix = networkName === Networks.Mainnet ? '' : `${networkName.toLowerCase()}.`; - return `https://${etherScanPrefix}etherscan.io/${suffix}/${addressOrTxHash}`; - }, -}; diff --git a/packages/react-shared/tsconfig.json b/packages/react-shared/tsconfig.json deleted file mode 100644 index 5abe0ab4e7..0000000000 --- a/packages/react-shared/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": "src", - "jsx": "react", - "baseUrl": ".", - "paths": { - "*": ["node_modules/@types/*", "*"] - } - }, - "include": ["./src/**/*"] -} diff --git a/packages/react-shared/tslint.json b/packages/react-shared/tslint.json deleted file mode 100644 index c3f6d9cae7..0000000000 --- a/packages/react-shared/tslint.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": ["@0x/tslint-config"], - "rules": { - "no-object-literal-type-assertion": false, - "completed-docs": false, - "prefer-function-over-method": false, - "custom-no-magic-numbers": false - } -} diff --git a/packages/website/package.json b/packages/website/package.json index 786a57a8a4..09a9064fe7 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -26,7 +26,6 @@ "@0x/contract-wrappers": "^9.1.7", "@0x/json-schemas": "^3.0.11", "@0x/order-utils": "^8.2.2", - "@0x/react-shared": "^2.0.15", "@0x/subproviders": "^4.1.2", "@0x/types": "^2.4.1", "@0x/typescript-typings": "^4.2.4", @@ -41,10 +40,13 @@ "basscss": "^8.0.3", "blockies": "^0.0.2", "bowser": "^1.9.4", + "change-case": "^3.0.2", "deep-equal": "^1.0.1", "ethereum-types": "^2.1.4", "ethereumjs-util": "^5.1.1", "find-versions": "^2.0.0", + "is-mobile": "^0.2.2", + "valid-url": "^1.0.9", "jsonschema": "^1.2.0", "less": "^2.7.2", "lodash": "^4.17.11", @@ -61,6 +63,7 @@ "react-flickity-component": "^3.1.0", "react-headroom": "2.2.2", "react-helmet": "^5.2.0", + "react-highlight": "0xproject/react-highlight#react-peer-deps", "react-lazyload": "^2.3.0", "react-loadable": "^5.5.0", "react-markdown": "^4.0.6", @@ -90,6 +93,8 @@ "@types/blockies": "^0.0.0", "@types/deep-equal": "^1.0.0", "@types/find-versions": "^2.0.0", + "@types/is-mobile": "0.3.0", + "@types/valid-url": "^1.0.2", "@types/jsonschema": "^1.1.1", "@types/lodash": "4.14.104", "@types/material-ui": "^0.20.0", diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index de7f38a8b5..1767384703 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -9,7 +9,6 @@ import { IndexedFilterValues, } from '@0x/contract-wrappers'; import { assetDataUtils, orderHashUtils, signatureUtils } from '@0x/order-utils'; -import { EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared'; import { ledgerEthereumBrowserClientFactoryAsync, LedgerSubprovider, @@ -43,6 +42,7 @@ import { BlockchainCallErrs, BlockchainErrs, ContractInstance, + EtherscanLinkSuffixes, Fill, InjectedProvider, InjectedProviderObservable, @@ -258,11 +258,7 @@ export class Blockchain { this._showFlashMessageIfLedger(); const txHash = await this._web3Wrapper.sendTransactionAsync(transaction); await this._showEtherScanLinkAndAwaitTransactionMinedAsync(txHash); - const etherScanLinkIfExists = sharedUtils.getEtherScanLinkIfExists( - txHash, - this.networkId, - EtherscanLinkSuffixes.Tx, - ); + const etherScanLinkIfExists = utils.getEtherScanLinkIfExists(txHash, this.networkId, EtherscanLinkSuffixes.Tx); this._dispatcher.showFlashMessage( React.createElement(AssetSendCompleted, { etherScanLinkIfExists, @@ -288,11 +284,7 @@ export class Blockchain { }, ); await this._showEtherScanLinkAndAwaitTransactionMinedAsync(txHash); - const etherScanLinkIfExists = sharedUtils.getEtherScanLinkIfExists( - txHash, - this.networkId, - EtherscanLinkSuffixes.Tx, - ); + const etherScanLinkIfExists = utils.getEtherScanLinkIfExists(txHash, this.networkId, EtherscanLinkSuffixes.Tx); this._dispatcher.showFlashMessage( React.createElement(AssetSendCompleted, { etherScanLinkIfExists, @@ -622,11 +614,7 @@ export class Blockchain { private async _showEtherScanLinkAndAwaitTransactionMinedAsync( txHash: string, ): Promise { - const etherScanLinkIfExists = sharedUtils.getEtherScanLinkIfExists( - txHash, - this.networkId, - EtherscanLinkSuffixes.Tx, - ); + const etherScanLinkIfExists = utils.getEtherScanLinkIfExists(txHash, this.networkId, EtherscanLinkSuffixes.Tx); this._dispatcher.showFlashMessage( React.createElement(TransactionSubmitted, { etherScanLinkIfExists, diff --git a/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx b/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx index 1c47903dbd..146cb56514 100644 --- a/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx +++ b/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx @@ -1,9 +1,9 @@ -import { colors, Networks } from '@0x/react-shared'; import Dialog from 'material-ui/Dialog'; import FlatButton from 'material-ui/FlatButton'; import * as React from 'react'; import { Blockchain } from 'ts/blockchain'; -import { BlockchainErrs } from 'ts/types'; +import { BlockchainErrs, Networks } from 'ts/types'; +import { colors } from 'ts/utils/colors'; import { constants } from 'ts/utils/constants'; interface BlockchainErrDialogProps { diff --git a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx index 9c799e9bab..5326cb70ae 100644 --- a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx +++ b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx @@ -1,4 +1,3 @@ -import { colors } from '@0x/react-shared'; import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import Dialog from 'material-ui/Dialog'; @@ -8,6 +7,7 @@ import { Blockchain } from 'ts/blockchain'; import { TokenAmountInput } from 'ts/components/inputs/token_amount_input'; import { EthAmountInput } from 'ts/containers/inputs/eth_amount_input'; import { Side, Token } from 'ts/types'; +import { colors } from 'ts/utils/colors'; interface EthWethConversionDialogProps { blockchain: Blockchain; diff --git a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx index 83cc857cdc..5df5e750b0 100644 --- a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx +++ b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx @@ -1,4 +1,3 @@ -import { colors, constants as sharedConstants } from '@0x/react-shared'; import { BigNumber, logUtils } from '@0x/utils'; import { Web3Wrapper } from '@0x/web3-wrapper'; import * as _ from 'lodash'; @@ -13,6 +12,7 @@ import { NetworkDropDown } from 'ts/components/dropdowns/network_drop_down'; import { LifeCycleRaisedButton } from 'ts/components/ui/lifecycle_raised_button'; import { Dispatcher } from 'ts/redux/dispatcher'; import { ProviderType } from 'ts/types'; +import { colors } from 'ts/utils/colors'; import { configs } from 'ts/utils/configs'; import { constants } from 'ts/utils/constants'; import { utils } from 'ts/utils/utils'; @@ -85,7 +85,7 @@ export class LedgerConfigDialog extends React.Component
Follow these instructions before proceeding:
@@ -166,7 +166,7 @@ export class LedgerConfigDialog extends React.Componentb7a^>zAP9;n_TZ0g(u{5(CMC%>=(-a8 z1H4)xSzyD z*=l`b3yY1V;Wy@?`!0x%9V&O8#( zKPzv};z z%JdO~sdOB7b)2WQR;tp0>B9%pcV_y8!sOj?eOHD9^OTz25HJKL2`s8hhxY%iU!VUc zlgyPNU {_.map(this.props.tutorials, tutorialInfo => ( diff --git a/packages/website/ts/components/documentation/reference/badge.tsx b/packages/website/ts/components/documentation/reference/badge.tsx index e3d5be273b..d0bdb99d30 100644 --- a/packages/website/ts/components/documentation/reference/badge.tsx +++ b/packages/website/ts/components/documentation/reference/badge.tsx @@ -1,5 +1,5 @@ -import { Styles } from '@0x/react-shared'; import * as React from 'react'; +import { Styles } from 'ts/types'; const styles: Styles = { badge: { diff --git a/packages/website/ts/components/documentation/reference/comment.tsx b/packages/website/ts/components/documentation/reference/comment.tsx index 4d34f711e9..5c14bebfd3 100644 --- a/packages/website/ts/components/documentation/reference/comment.tsx +++ b/packages/website/ts/components/documentation/reference/comment.tsx @@ -1,6 +1,7 @@ -import { colors, MarkdownCodeBlock } from '@0x/react-shared'; import * as React from 'react'; import * as ReactMarkdown from 'react-markdown'; +import { MarkdownCodeBlock } from 'ts/components/documentation/shared/markdown_code_block'; +import { colors } from 'ts/utils/colors'; export interface CommentProps { comment: string; diff --git a/packages/website/ts/components/documentation/reference/doc_reference.tsx b/packages/website/ts/components/documentation/reference/doc_reference.tsx index 755584b6fb..52ab5599d4 100644 --- a/packages/website/ts/components/documentation/reference/doc_reference.tsx +++ b/packages/website/ts/components/documentation/reference/doc_reference.tsx @@ -1,14 +1,3 @@ -import { - colors, - constants as sharedConstants, - EtherscanLinkSuffixes, - HeaderSizes, - Link, - MarkdownSection, - Networks, - SectionHeader, - utils as sharedUtils, -} from '@0x/react-shared'; import { DocAgnosticFormat, Event, @@ -22,10 +11,15 @@ import { import * as _ from 'lodash'; import * as React from 'react'; import * as semver from 'semver'; +import { Link } from 'ts/components/documentation/shared/link'; +import { MarkdownSection } from 'ts/components/documentation/shared/markdown_section'; +import { SectionHeader } from 'ts/components/documentation/shared/section_header'; +import { AddressByContractName, EtherscanLinkSuffixes, HeaderSizes, Networks, SupportedDocJson } from 'ts/types'; +import { colors } from 'ts/utils/colors'; +import { constants } from 'ts/utils/constants'; +import { utils } from 'ts/utils/utils'; -import { AddressByContractName, SupportedDocJson } from '../../../types'; -import { constants } from '../../../utils/constants'; -import { DocsInfo } from '../../../utils/docs_info'; +import { DocsInfo } from 'ts/utils/docs_info'; import { Badge } from './badge'; import { Comment } from './comment'; @@ -55,7 +49,7 @@ export class DocReference extends React.Component -
+
{renderedSections}
); @@ -250,9 +244,9 @@ export class DocReference extends React.Component = (props: TypeProps): any => { : `${props.docsInfo.typeSectionName}-${typeName}`; typeName = ( - {sharedUtils.isUserOnMobile() || props.isInPopover || isExportedClassReference ? ( + {utils.isUserOnMobile() || props.isInPopover || isExportedClassReference ? ( {typeName} ) : ( diff --git a/packages/website/ts/components/documentation/reference/type_definition.tsx b/packages/website/ts/components/documentation/reference/type_definition.tsx index 1b59d383e0..3ea1f915e8 100644 --- a/packages/website/ts/components/documentation/reference/type_definition.tsx +++ b/packages/website/ts/components/documentation/reference/type_definition.tsx @@ -1,12 +1,13 @@ -import { AnchorTitle, colors, HeaderSizes } from '@0x/react-shared'; import { CustomType, CustomTypeChild, TypeDefinitionByName, TypeDocTypes } from '@0x/types'; import { errorUtils } from '@0x/utils'; import * as _ from 'lodash'; import * as React from 'react'; +import { AnchorTitle } from 'ts/components/documentation/shared/anchor_title'; -import { KindString, SupportedDocJson } from '../../../types'; -import { constants } from '../../../utils/constants'; -import { DocsInfo } from '../../../utils/docs_info'; +import { HeaderSizes, KindString, SupportedDocJson } from 'ts/types'; +import { colors } from 'ts/utils/colors'; +import { constants } from 'ts/utils/constants'; +import { DocsInfo } from 'ts/utils/docs_info'; import { Comment } from './comment'; import { CustomEnum } from './custom_enum'; diff --git a/packages/website/ts/components/documentation/shared/.DS_Store b/packages/website/ts/components/documentation/shared/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..426195b45847555c1eccdc366bc1604984714e7d GIT binary patch literal 6148 zcmeHKyG{c!5S$H>2uc$nBq%7Zq(b5kPEjbRDJVl8CqNvzC<%h{3jTx-;gk3Tm|dIb zqC7~21nf%dv3nJuw_oI5_k{f78iCH@c(9C5<< zAxC^-W|yNEY-OzV$yTtviS6whwy*hY#U{-P+wqFIjcv9)+;Gl4jH%OhyjK<8gB83} zu6JN>OF<3RYAvr7o_+2|HLJ_nWSo_1H`&1PUg5A!^THKy1^%@HJhRmr&46CI0PX`OT0ubx$He+4y5}K1lOe2;7`Gh7Rl^9YbUNI!3vp void; @@ -24,7 +24,7 @@ export class NetworkDropDown extends React.Component { - const networkName = sharedConstants.NETWORK_NAME_BY_ID[networkId]; + const networkName = constants.NETWORK_NAME_BY_ID[networkId]; const primaryText = (
diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx index 34f06cc304..8517c6ae58 100644 --- a/packages/website/ts/components/eth_wrappers.tsx +++ b/packages/website/ts/components/eth_wrappers.tsx @@ -1,4 +1,3 @@ -import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared'; import { BigNumber } from '@0x/utils'; import { Web3Wrapper } from '@0x/web3-wrapper'; import * as _ from 'lodash'; @@ -11,6 +10,7 @@ import { Blockchain } from 'ts/blockchain'; import { EthWethConversionButton } from 'ts/components/eth_weth_conversion_button'; import { Dispatcher } from 'ts/redux/dispatcher'; import { + EtherscanLinkSuffixes, OutdatedWrappedEtherByNetworkId, Side, Token, @@ -18,6 +18,7 @@ import { TokenState, TokenStateByAddress, } from 'ts/types'; +import { colors } from 'ts/utils/colors'; import { configs } from 'ts/utils/configs'; import { constants } from 'ts/utils/constants'; import { utils } from 'ts/utils/utils'; @@ -91,7 +92,7 @@ export class EthWrappers extends React.Component; @@ -15,10 +18,10 @@ export interface NestedSidebarMenuProps { export const NestedSidebarMenu = (props: NestedSidebarMenuProps) => { const navigation = _.map(props.sectionNameToLinks, (links: ALink[], sectionName: string) => { - const finalSectionName = sharedUtils.convertCamelCaseToSpaces(sectionName); + const finalSectionName = utils.convertCamelCaseToSpaces(sectionName); const menuItems = _.map(links, (link, i) => { const menuItemTitle = props.shouldReformatMenuItemNames - ? _.capitalize(sharedUtils.convertDashesToSpaces(link.title)) + ? _.capitalize(utils.convertDashesToSpaces(link.title)) : link.title; const finalLink = { ...link, diff --git a/packages/website/ts/components/old_footer.tsx b/packages/website/ts/components/old_footer.tsx index e0c207293e..cf164431be 100644 --- a/packages/website/ts/components/old_footer.tsx +++ b/packages/website/ts/components/old_footer.tsx @@ -1,12 +1,14 @@ -import { ALink, colors, Link } from '@0x/react-shared'; +import { Link } from 'ts/components/documentation/shared/link'; + import { ObjectMap } from '@0x/types'; import * as _ from 'lodash'; import DropDownMenu from 'material-ui/DropDownMenu'; import MenuItem from 'material-ui/MenuItem'; import * as React from 'react'; +import { colors } from 'ts/style/colors'; import { Dispatcher } from 'ts/redux/dispatcher'; -import { Deco, Key, Language, WebsitePaths } from 'ts/types'; +import { ALink, Deco, Key, Language, WebsitePaths } from 'ts/types'; import { constants } from 'ts/utils/constants'; import { Translate } from 'ts/utils/translate'; diff --git a/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx b/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx index 173ba9a973..46aaee5886 100644 --- a/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx +++ b/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx @@ -1,4 +1,4 @@ -import { colors } from '@0x/react-shared'; +import { colors } from 'ts/utils/colors'; import * as React from 'react'; import { Container } from 'ts/components/ui/container'; import { Image } from 'ts/components/ui/image'; diff --git a/packages/website/ts/components/onboarding/onboarding_card.tsx b/packages/website/ts/components/onboarding/onboarding_card.tsx index 56330c3e7c..658ad58de2 100644 --- a/packages/website/ts/components/onboarding/onboarding_card.tsx +++ b/packages/website/ts/components/onboarding/onboarding_card.tsx @@ -1,5 +1,5 @@ -import { colors } from '@0x/react-shared'; import * as React from 'react'; +import { colors } from 'ts/utils/colors'; import * as _ from 'lodash'; import { Button } from 'ts/components/ui/button'; diff --git a/packages/website/ts/components/onboarding/wrap_eth_onboarding_step.tsx b/packages/website/ts/components/onboarding/wrap_eth_onboarding_step.tsx index 37eef867bc..3ac7661cda 100644 --- a/packages/website/ts/components/onboarding/wrap_eth_onboarding_step.tsx +++ b/packages/website/ts/components/onboarding/wrap_eth_onboarding_step.tsx @@ -1,10 +1,10 @@ -import { colors } from '@0x/react-shared'; import { BigNumber } from '@0x/utils'; import * as React from 'react'; import { Balance } from 'ts/components/ui/balance'; import { Container } from 'ts/components/ui/container'; import { IconButton } from 'ts/components/ui/icon_button'; import { Text } from 'ts/components/ui/text'; +import { colors } from 'ts/utils/colors'; import { constants } from 'ts/utils/constants'; export interface WrapEthOnboardingStep1Props {} diff --git a/packages/website/ts/components/portal/back_button.tsx b/packages/website/ts/components/portal/back_button.tsx index 9b4451196d..9393bd95a9 100644 --- a/packages/website/ts/components/portal/back_button.tsx +++ b/packages/website/ts/components/portal/back_button.tsx @@ -1,7 +1,8 @@ -import { Link, Styles } from '@0x/react-shared'; +import { Link } from 'ts/components/documentation/shared/link'; import * as React from 'react'; import { Island } from 'ts/components/ui/island'; import { colors } from 'ts/style/colors'; +import { Styles } from 'ts/types'; export interface BackButtonProps { to: string; diff --git a/packages/website/ts/components/portal/drawer_menu.tsx b/packages/website/ts/components/portal/drawer_menu.tsx index f9a91370db..7a67aa147e 100644 --- a/packages/website/ts/components/portal/drawer_menu.tsx +++ b/packages/website/ts/components/portal/drawer_menu.tsx @@ -1,4 +1,3 @@ -import { Styles } from '@0x/react-shared'; import * as _ from 'lodash'; import * as React from 'react'; @@ -7,7 +6,7 @@ import { defaultMenuItemEntries, Menu } from 'ts/components/portal/menu'; import { Identicon } from 'ts/components/ui/identicon'; import { Text } from 'ts/components/ui/text'; import { colors } from 'ts/style/colors'; -import { ProviderType, WebsitePaths } from 'ts/types'; +import { ProviderType, Styles, WebsitePaths } from 'ts/types'; import { utils } from 'ts/utils/utils'; const IDENTICON_DIAMETER = 45; diff --git a/packages/website/ts/components/portal/menu.tsx b/packages/website/ts/components/portal/menu.tsx index fee347dd99..91ade92c9d 100644 --- a/packages/website/ts/components/portal/menu.tsx +++ b/packages/website/ts/components/portal/menu.tsx @@ -1,9 +1,8 @@ -import { Styles } from '@0x/react-shared'; import * as _ from 'lodash'; import * as React from 'react'; import { CustomMenuItem } from 'ts/components/ui/custom_menu_item'; import { colors } from 'ts/style/colors'; -import { WebsitePaths } from 'ts/types'; +import { Styles, WebsitePaths } from 'ts/types'; export interface MenuTheme { paddingLeft: number; diff --git a/packages/website/ts/components/portal/portal.tsx b/packages/website/ts/components/portal/portal.tsx index 2bce1bf683..5a72d9dba4 100644 --- a/packages/website/ts/components/portal/portal.tsx +++ b/packages/website/ts/components/portal/portal.tsx @@ -1,8 +1,9 @@ -import { colors, Link } from '@0x/react-shared'; +import { Link } from 'ts/components/documentation/shared/link'; import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import * as React from 'react'; import { Redirect, Route, RouteComponentProps, Switch } from 'react-router-dom'; +import { colors } from 'ts/style/colors'; import { Blockchain } from 'ts/blockchain'; import { ANNOUNCEMENT_BANNER_HEIGHT, AnnouncementBanner } from 'ts/components/annoucement_banner'; diff --git a/packages/website/ts/components/portal/text_header.tsx b/packages/website/ts/components/portal/text_header.tsx index b6045b8323..8b225e3811 100644 --- a/packages/website/ts/components/portal/text_header.tsx +++ b/packages/website/ts/components/portal/text_header.tsx @@ -1,4 +1,4 @@ -import { colors } from '@0x/react-shared'; +import { colors } from 'ts/utils/colors'; import * as React from 'react'; import { Text } from 'ts/components/ui/text'; diff --git a/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx b/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx index 7748a3ccb6..571525629e 100644 --- a/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx +++ b/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx @@ -1,4 +1,3 @@ -import { Styles } from '@0x/react-shared'; import * as _ from 'lodash'; import { GridTile as PlainGridTile } from 'material-ui/GridList'; import * as React from 'react'; @@ -11,7 +10,7 @@ import { Island } from 'ts/components/ui/island'; import { colors } from 'ts/style/colors'; import { media } from 'ts/style/media'; import { styled } from 'ts/style/theme'; -import { WebsiteBackendRelayerInfo } from 'ts/types'; +import { Styles, WebsiteBackendRelayerInfo } from 'ts/types'; import { utils } from 'ts/utils/utils'; export enum RelayerGridTileStyle { diff --git a/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx b/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx index 558d998556..726fec2f7c 100644 --- a/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx +++ b/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx @@ -1,10 +1,10 @@ -import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared'; import * as _ from 'lodash'; import * as React from 'react'; +import { colors } from 'ts/utils/colors'; import { Container } from 'ts/components/ui/container'; import { Text } from 'ts/components/ui/text'; -import { WebsiteBackendTokenInfo } from 'ts/types'; +import { EtherscanLinkSuffixes, WebsiteBackendTokenInfo } from 'ts/types'; import { analytics } from 'ts/utils/analytics'; import { utils } from 'ts/utils/utils'; @@ -56,6 +56,6 @@ class TokenLink extends React.Component { ); } private _tokenLinkFromToken(tokenInfo: WebsiteBackendTokenInfo, networkId: number): string { - return sharedUtils.getEtherScanLinkIfExists(tokenInfo.address, networkId, EtherscanLinkSuffixes.Address); + return utils.getEtherScanLinkIfExists(tokenInfo.address, networkId, EtherscanLinkSuffixes.Address); } } diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx index 37272e4fe2..576ebf1ae9 100644 --- a/packages/website/ts/components/token_balances.tsx +++ b/packages/website/ts/components/token_balances.tsx @@ -1,10 +1,3 @@ -import { - constants as sharedConstants, - EtherscanLinkSuffixes, - Networks, - Styles, - utils as sharedUtils, -} from '@0x/react-shared'; import { BigNumber, errorUtils, fetchAsync, logUtils } from '@0x/utils'; import { Web3Wrapper } from '@0x/web3-wrapper'; import * as _ from 'lodash'; @@ -31,7 +24,10 @@ import { BalanceErrs, BlockchainCallErrs, BlockchainErrs, + EtherscanLinkSuffixes, + Networks, ScreenWidths, + Styles, Token, TokenByAddress, TokenStateByAddress, @@ -115,7 +111,7 @@ export class TokenBalances extends React.Component diff --git a/packages/website/ts/components/top_bar/provider_display.tsx b/packages/website/ts/components/top_bar/provider_display.tsx index 02b853a3f5..d8394baba2 100644 --- a/packages/website/ts/components/top_bar/provider_display.tsx +++ b/packages/website/ts/components/top_bar/provider_display.tsx @@ -1,4 +1,3 @@ -import { Styles } from '@0x/react-shared'; import * as _ from 'lodash'; import CircularProgress from 'material-ui/CircularProgress'; import ActionAccountBalanceWallet from 'material-ui/svg-icons/action/account-balance-wallet'; @@ -20,7 +19,7 @@ import { import { Text } from 'ts/components/ui/text'; import { Dispatcher } from 'ts/redux/dispatcher'; import { colors } from 'ts/style/colors'; -import { AccountState, ProviderType } from 'ts/types'; +import { AccountState, ProviderType, Styles } from 'ts/types'; import { utils } from 'ts/utils/utils'; const ROOT_HEIGHT = 24; diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx index d88f6e99b6..cfb2280b42 100644 --- a/packages/website/ts/components/top_bar/top_bar.tsx +++ b/packages/website/ts/components/top_bar/top_bar.tsx @@ -1,4 +1,5 @@ -import { ALink, colors, Link, Styles } from '@0x/react-shared'; +import { Link } from 'ts/components/documentation/shared/link'; + import { ObjectMap } from '@0x/types'; import * as _ from 'lodash'; import Drawer from 'material-ui/Drawer'; @@ -11,7 +12,8 @@ import { ProviderDisplay } from 'ts/components/top_bar/provider_display'; import { TopBarMenuItem } from 'ts/components/top_bar/top_bar_menu_item'; import { Container } from 'ts/components/ui/container'; import { Dispatcher } from 'ts/redux/dispatcher'; -import { Deco, Key, ProviderType, WebsitePaths } from 'ts/types'; +import { ALink, Deco, Key, ProviderType, Styles, WebsitePaths } from 'ts/types'; +import { colors } from 'ts/utils/colors'; import { constants } from 'ts/utils/constants'; import { Translate } from 'ts/utils/translate'; diff --git a/packages/website/ts/components/top_bar/top_bar_menu_item.tsx b/packages/website/ts/components/top_bar/top_bar_menu_item.tsx index 568d8dba6a..729b52fc97 100644 --- a/packages/website/ts/components/top_bar/top_bar_menu_item.tsx +++ b/packages/website/ts/components/top_bar/top_bar_menu_item.tsx @@ -1,6 +1,7 @@ -import { colors, Link } from '@0x/react-shared'; +import { Link } from 'ts/components/documentation/shared/link'; import * as _ from 'lodash'; import * as React from 'react'; +import { colors } from 'ts/style/colors'; import { CallToAction } from 'ts/components/ui/button'; diff --git a/packages/website/ts/components/track_token_confirmation.tsx b/packages/website/ts/components/track_token_confirmation.tsx index e701686b0a..4108d7e35c 100644 --- a/packages/website/ts/components/track_token_confirmation.tsx +++ b/packages/website/ts/components/track_token_confirmation.tsx @@ -1,4 +1,4 @@ -import { colors } from '@0x/react-shared'; +import { colors } from 'ts/utils/colors'; import * as _ from 'lodash'; import * as React from 'react'; import { Party } from 'ts/components/ui/party'; diff --git a/packages/website/ts/components/trade_history/trade_history_item.tsx b/packages/website/ts/components/trade_history/trade_history_item.tsx index 6798d6716c..224e6021d6 100644 --- a/packages/website/ts/components/trade_history/trade_history_item.tsx +++ b/packages/website/ts/components/trade_history/trade_history_item.tsx @@ -1,4 +1,3 @@ -import { colors, EtherscanLinkSuffixes } from '@0x/react-shared'; import { BigNumber } from '@0x/utils'; import { Web3Wrapper } from '@0x/web3-wrapper'; import * as _ from 'lodash'; @@ -8,7 +7,8 @@ import * as React from 'react'; import * as ReactTooltip from 'react-tooltip'; import { EtherScanIcon } from 'ts/components/ui/etherscan_icon'; import { Party } from 'ts/components/ui/party'; -import { Fill, Token, TokenByAddress } from 'ts/types'; +import { EtherscanLinkSuffixes, Fill, Token, TokenByAddress } from 'ts/types'; +import { colors } from 'ts/utils/colors'; import { configs } from 'ts/utils/configs'; const IDENTICON_DIAMETER = 40; diff --git a/packages/website/ts/components/ui/alert.tsx b/packages/website/ts/components/ui/alert.tsx index c7a5b90309..4efc2c7697 100644 --- a/packages/website/ts/components/ui/alert.tsx +++ b/packages/website/ts/components/ui/alert.tsx @@ -1,6 +1,6 @@ -import { colors } from '@0x/react-shared'; import * as React from 'react'; import { AlertTypes } from 'ts/types'; +import { colors } from 'ts/utils/colors'; interface AlertProps { type: AlertTypes; diff --git a/packages/website/ts/components/ui/allowance_state_view.tsx b/packages/website/ts/components/ui/allowance_state_view.tsx index fc754421ab..d2882dfa4a 100644 --- a/packages/website/ts/components/ui/allowance_state_view.tsx +++ b/packages/website/ts/components/ui/allowance_state_view.tsx @@ -1,7 +1,7 @@ -import { colors } from '@0x/react-shared'; import * as React from 'react'; import { Container } from 'ts/components/ui/container'; import { Spinner } from 'ts/components/ui/spinner'; +import { colors } from 'ts/utils/colors'; export enum AllowanceState { Locked, diff --git a/packages/website/ts/components/ui/button.tsx b/packages/website/ts/components/ui/button.tsx index 92f9278432..3ff8397ff7 100644 --- a/packages/website/ts/components/ui/button.tsx +++ b/packages/website/ts/components/ui/button.tsx @@ -1,7 +1,7 @@ -import { colors } from '@0x/react-shared'; import { darken, saturate } from 'polished'; import * as React from 'react'; import { styled } from 'ts/style/theme'; +import { colors } from 'ts/utils/colors'; export interface ButtonProps { className?: string; diff --git a/packages/website/ts/components/ui/check_mark.tsx b/packages/website/ts/components/ui/check_mark.tsx index 86e427c8b2..9f7056b092 100644 --- a/packages/website/ts/components/ui/check_mark.tsx +++ b/packages/website/ts/components/ui/check_mark.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import { colors } from '@0x/react-shared'; +import { colors } from 'ts/utils/colors'; export interface CheckMarkProps { color?: string; diff --git a/packages/website/ts/components/ui/copy_icon.tsx b/packages/website/ts/components/ui/copy_icon.tsx index 403cd4607f..c24b483ed4 100644 --- a/packages/website/ts/components/ui/copy_icon.tsx +++ b/packages/website/ts/components/ui/copy_icon.tsx @@ -1,4 +1,4 @@ -import { colors } from '@0x/react-shared'; +import { colors } from 'ts/utils/colors'; import * as React from 'react'; import * as CopyToClipboard from 'react-copy-to-clipboard'; import * as ReactDOM from 'react-dom'; diff --git a/packages/website/ts/components/ui/custom_menu_item.tsx b/packages/website/ts/components/ui/custom_menu_item.tsx index 87ce32126e..9c9698b801 100644 --- a/packages/website/ts/components/ui/custom_menu_item.tsx +++ b/packages/website/ts/components/ui/custom_menu_item.tsx @@ -1,4 +1,4 @@ -import { Link } from '@0x/react-shared'; +import { Link } from 'ts/components/documentation/shared/link'; import * as _ from 'lodash'; import * as React from 'react'; diff --git a/packages/website/ts/components/ui/ethereum_address.tsx b/packages/website/ts/components/ui/ethereum_address.tsx index 12f8636eba..f6d9d310e9 100644 --- a/packages/website/ts/components/ui/ethereum_address.tsx +++ b/packages/website/ts/components/ui/ethereum_address.tsx @@ -1,7 +1,7 @@ -import { EtherscanLinkSuffixes } from '@0x/react-shared'; import * as React from 'react'; import ReactTooltip from 'react-tooltip'; import { EtherScanIcon } from 'ts/components/ui/etherscan_icon'; +import { EtherscanLinkSuffixes } from 'ts/types'; import { utils } from 'ts/utils/utils'; interface EthereumAddressProps { diff --git a/packages/website/ts/components/ui/etherscan_icon.tsx b/packages/website/ts/components/ui/etherscan_icon.tsx index c15fd085eb..11ef98991a 100644 --- a/packages/website/ts/components/ui/etherscan_icon.tsx +++ b/packages/website/ts/components/ui/etherscan_icon.tsx @@ -1,7 +1,9 @@ -import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared'; import * as _ from 'lodash'; import * as React from 'react'; import ReactTooltip from 'react-tooltip'; +import { EtherscanLinkSuffixes } from 'ts/types'; +import { colors } from 'ts/utils/colors'; +import { utils } from 'ts/utils/utils'; interface EtherScanIconProps { addressOrTxHash: string; @@ -10,7 +12,7 @@ interface EtherScanIconProps { } export const EtherScanIcon = (props: EtherScanIconProps) => { - const etherscanLinkIfExists = sharedUtils.getEtherScanLinkIfExists( + const etherscanLinkIfExists = utils.getEtherScanLinkIfExists( props.addressOrTxHash, props.networkId, props.etherscanLinkSuffixes, diff --git a/packages/website/ts/components/ui/fake_text_field.tsx b/packages/website/ts/components/ui/fake_text_field.tsx index 7c3a482a4c..d8c2ebb2fb 100644 --- a/packages/website/ts/components/ui/fake_text_field.tsx +++ b/packages/website/ts/components/ui/fake_text_field.tsx @@ -1,6 +1,6 @@ -import { Styles } from '@0x/react-shared'; import * as React from 'react'; import { InputLabel } from 'ts/components/ui/input_label'; +import { Styles } from 'ts/types'; const styles: Styles = { hr: { diff --git a/packages/website/ts/components/ui/icon_button.tsx b/packages/website/ts/components/ui/icon_button.tsx index 9f469ec69d..67af7b62cc 100644 --- a/packages/website/ts/components/ui/icon_button.tsx +++ b/packages/website/ts/components/ui/icon_button.tsx @@ -1,6 +1,7 @@ -import { colors, Styles } from '@0x/react-shared'; import * as _ from 'lodash'; import * as React from 'react'; +import { Styles } from 'ts/types'; +import { colors } from 'ts/utils/colors'; export interface IconButtonProps { iconName: string; diff --git a/packages/website/ts/components/ui/input_label.tsx b/packages/website/ts/components/ui/input_label.tsx index e7afb5a170..5c7651d54a 100644 --- a/packages/website/ts/components/ui/input_label.tsx +++ b/packages/website/ts/components/ui/input_label.tsx @@ -1,5 +1,6 @@ -import { colors, Styles } from '@0x/react-shared'; import * as React from 'react'; +import { Styles } from 'ts/types'; +import { colors } from 'ts/utils/colors'; export interface InputLabelProps { text: string | Element | React.ReactNode; diff --git a/packages/website/ts/components/ui/lifecycle_raised_button.tsx b/packages/website/ts/components/ui/lifecycle_raised_button.tsx index f004dd47f6..08c2742059 100644 --- a/packages/website/ts/components/ui/lifecycle_raised_button.tsx +++ b/packages/website/ts/components/ui/lifecycle_raised_button.tsx @@ -1,4 +1,4 @@ -import { colors } from '@0x/react-shared'; +import { colors } from 'ts/utils/colors'; import { errorUtils } from '@0x/utils'; import RaisedButton from 'material-ui/RaisedButton'; import * as React from 'react'; diff --git a/packages/website/ts/components/ui/multi_select.tsx b/packages/website/ts/components/ui/multi_select.tsx index 40b1c9cee8..70b5431f58 100644 --- a/packages/website/ts/components/ui/multi_select.tsx +++ b/packages/website/ts/components/ui/multi_select.tsx @@ -1,4 +1,4 @@ -import { colors } from '@0x/react-shared'; +import { colors } from 'ts/utils/colors'; import * as _ from 'lodash'; import * as React from 'react'; diff --git a/packages/website/ts/components/ui/party.tsx b/packages/website/ts/components/ui/party.tsx index 4090634178..fe85aef0c5 100644 --- a/packages/website/ts/components/ui/party.tsx +++ b/packages/website/ts/components/ui/party.tsx @@ -1,9 +1,11 @@ -import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared'; import * as _ from 'lodash'; import * as React from 'react'; import ReactTooltip from 'react-tooltip'; import { EthereumAddress } from 'ts/components/ui/ethereum_address'; import { Identicon } from 'ts/components/ui/identicon'; +import { EtherscanLinkSuffixes } from 'ts/types'; +import { colors } from 'ts/utils/colors'; +import { utils } from 'ts/utils/utils'; const IMAGE_DIMENSION = 100; const IDENTICON_DIAMETER = 95; @@ -41,7 +43,7 @@ export class Party extends React.Component { width: IMAGE_DIMENSION, height: IMAGE_DIMENSION, }; - const etherscanLinkIfExists = sharedUtils.getEtherScanLinkIfExists( + const etherscanLinkIfExists = utils.getEtherScanLinkIfExists( this.props.address, this.props.networkId, EtherscanLinkSuffixes.Address, diff --git a/packages/website/ts/components/ui/pointer.tsx b/packages/website/ts/components/ui/pointer.tsx index c97b1e7000..013c29fefe 100644 --- a/packages/website/ts/components/ui/pointer.tsx +++ b/packages/website/ts/components/ui/pointer.tsx @@ -1,4 +1,4 @@ -import { colors } from '@0x/react-shared'; +import { colors } from 'ts/utils/colors'; import * as React from 'react'; import { styled } from 'ts/style/theme'; diff --git a/packages/website/ts/components/ui/required_label.tsx b/packages/website/ts/components/ui/required_label.tsx index 5080462fa9..cc46b32697 100644 --- a/packages/website/ts/components/ui/required_label.tsx +++ b/packages/website/ts/components/ui/required_label.tsx @@ -1,4 +1,4 @@ -import { colors } from '@0x/react-shared'; +import { colors } from 'ts/utils/colors'; import * as React from 'react'; export interface RequiredLabelProps { diff --git a/packages/website/ts/components/ui/simple_menu.tsx b/packages/website/ts/components/ui/simple_menu.tsx index 45ee752e33..e44af6db1b 100644 --- a/packages/website/ts/components/ui/simple_menu.tsx +++ b/packages/website/ts/components/ui/simple_menu.tsx @@ -1,4 +1,4 @@ -import { Link } from '@0x/react-shared'; +import { Link } from 'ts/components/documentation/shared/link'; import * as _ from 'lodash'; import * as React from 'react'; import * as CopyToClipboard from 'react-copy-to-clipboard'; diff --git a/packages/website/ts/components/ui/spinner.tsx b/packages/website/ts/components/ui/spinner.tsx index dc73e74e32..a18620d6e9 100644 --- a/packages/website/ts/components/ui/spinner.tsx +++ b/packages/website/ts/components/ui/spinner.tsx @@ -1,4 +1,4 @@ -import { colors } from '@0x/react-shared'; +import { colors } from 'ts/utils/colors'; import * as React from 'react'; import { styled } from 'ts/style/theme'; diff --git a/packages/website/ts/components/ui/swap_icon.tsx b/packages/website/ts/components/ui/swap_icon.tsx index 406da8fe1d..87b91217b8 100644 --- a/packages/website/ts/components/ui/swap_icon.tsx +++ b/packages/website/ts/components/ui/swap_icon.tsx @@ -1,4 +1,4 @@ -import { colors } from '@0x/react-shared'; +import { colors } from 'ts/utils/colors'; import * as React from 'react'; interface SwapIconProps { diff --git a/packages/website/ts/components/ui/text.tsx b/packages/website/ts/components/ui/text.tsx index 046442ee59..d8029e933e 100644 --- a/packages/website/ts/components/ui/text.tsx +++ b/packages/website/ts/components/ui/text.tsx @@ -1,4 +1,4 @@ -import { colors } from '@0x/react-shared'; +import { colors } from 'ts/utils/colors'; import { darken } from 'polished'; import * as React from 'react'; import { styled } from 'ts/style/theme'; diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx index ac07d6ee4b..c6ef9eb628 100644 --- a/packages/website/ts/components/wallet/wallet.tsx +++ b/packages/website/ts/components/wallet/wallet.tsx @@ -1,6 +1,6 @@ -import { EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared'; import { BigNumber, errorUtils } from '@0x/utils'; import * as _ from 'lodash'; +import { utils } from 'ts/utils/utils'; import ActionAccountBalanceWallet from 'material-ui/svg-icons/action/account-balance-wallet'; import * as React from 'react'; @@ -35,6 +35,7 @@ import { colors } from 'ts/style/colors'; import { AccountState, BlockchainErrs, + EtherscanLinkSuffixes, ProviderType, ScreenWidths, Side, @@ -45,7 +46,6 @@ import { } from 'ts/types'; import { analytics } from 'ts/utils/analytics'; import { constants } from 'ts/utils/constants'; -import { utils } from 'ts/utils/utils'; export interface WalletProps { userAddress: string; @@ -324,7 +324,7 @@ export class Wallet extends React.Component { if (tokenState === undefined) { return null; } - const tokenLink = sharedUtils.getEtherScanLinkIfExists( + const tokenLink = utils.getEtherScanLinkIfExists( token.address, this.props.networkId, EtherscanLinkSuffixes.Address, diff --git a/packages/website/ts/components/wallet/wrap_ether_item.tsx b/packages/website/ts/components/wallet/wrap_ether_item.tsx index 7de3afbf81..b87d59659f 100644 --- a/packages/website/ts/components/wallet/wrap_ether_item.tsx +++ b/packages/website/ts/components/wallet/wrap_ether_item.tsx @@ -1,4 +1,3 @@ -import { Styles } from '@0x/react-shared'; import { BigNumber, logUtils } from '@0x/utils'; import { Web3Wrapper } from '@0x/web3-wrapper'; import * as _ from 'lodash'; @@ -11,7 +10,7 @@ import { Container } from 'ts/components/ui/container'; import { EthAmountInput } from 'ts/containers/inputs/eth_amount_input'; import { Dispatcher } from 'ts/redux/dispatcher'; import { colors } from 'ts/style/colors'; -import { BlockchainCallErrs, Side, Token } from 'ts/types'; +import { BlockchainCallErrs, Side, Styles, Token } from 'ts/types'; import { analytics } from 'ts/utils/analytics'; import { constants } from 'ts/utils/constants'; import { errorReporter } from 'ts/utils/error_reporter'; diff --git a/packages/website/ts/containers/smart_contracts_documentation.ts b/packages/website/ts/containers/smart_contracts_documentation.ts index f0413de3e6..b0641bc6be 100644 --- a/packages/website/ts/containers/smart_contracts_documentation.ts +++ b/packages/website/ts/containers/smart_contracts_documentation.ts @@ -1,8 +1,7 @@ -import { Networks } from '@0x/react-shared'; import * as React from 'react'; import { connect } from 'react-redux'; import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page'; -import { DocPackages, SmartContractDocSections as Sections } from 'ts/types'; +import { DocPackages, Networks, SmartContractDocSections as Sections } from 'ts/types'; import { DocsInfoConfig, SupportedDocJson } from '../types'; import { getMapStateToProps, mapDispatchToProps } from '../utils/documentation_container'; diff --git a/packages/website/ts/pages/documentation/developers_page.tsx b/packages/website/ts/pages/documentation/developers_page.tsx index 97c713fbfb..b13c13004c 100644 --- a/packages/website/ts/pages/documentation/developers_page.tsx +++ b/packages/website/ts/pages/documentation/developers_page.tsx @@ -1,4 +1,3 @@ -import { colors, constants as sharedConstants } from '@0x/react-shared'; import * as _ from 'lodash'; import * as React from 'react'; import { Helmet } from 'react-helmet'; @@ -10,6 +9,8 @@ import { Dispatcher } from 'ts/redux/dispatcher'; import { media } from 'ts/style/media'; import { styled } from 'ts/style/theme'; import { ScreenWidths } from 'ts/types'; +import { colors } from 'ts/utils/colors'; +import { constants } from 'ts/utils/constants'; import { documentConstants } from 'ts/utils/document_meta_constants'; import { Translate } from 'ts/utils/translate'; import { utils } from 'ts/utils/utils'; @@ -145,7 +146,7 @@ export class DevelopersPage extends React.Component - + {this.props.mainContent} diff --git a/packages/website/ts/pages/documentation/docs_home.tsx b/packages/website/ts/pages/documentation/docs_home.tsx index e240936017..3a1afb78e6 100644 --- a/packages/website/ts/pages/documentation/docs_home.tsx +++ b/packages/website/ts/pages/documentation/docs_home.tsx @@ -1,4 +1,5 @@ -import { ALink, colors, Link } from '@0x/react-shared'; +import { Link } from 'ts/components/documentation/shared/link'; + import { ObjectMap } from '@0x/types'; import * as _ from 'lodash'; import * as React from 'react'; @@ -7,7 +8,8 @@ import { NestedSidebarMenu } from 'ts/components/nested_sidebar_menu'; import { Button } from 'ts/components/ui/button'; import { DevelopersPage } from 'ts/pages/documentation/developers_page'; import { Dispatcher } from 'ts/redux/dispatcher'; -import { Categories, Deco, Key, Package, ScreenWidths, TutorialInfo, WebsitePaths } from 'ts/types'; +import { ALink, Categories, Deco, Key, Package, ScreenWidths, TutorialInfo, WebsitePaths } from 'ts/types'; +import { colors } from 'ts/utils/colors'; import { constants } from 'ts/utils/constants'; import { Translate } from 'ts/utils/translate'; diff --git a/packages/website/ts/pages/faq/faq.tsx b/packages/website/ts/pages/faq/faq.tsx index b86a1ca322..b2ada21030 100644 --- a/packages/website/ts/pages/faq/faq.tsx +++ b/packages/website/ts/pages/faq/faq.tsx @@ -1,4 +1,3 @@ -import { colors, Styles } from '@0x/react-shared'; import * as _ from 'lodash'; import * as React from 'react'; import { DocumentTitle } from 'ts/components/document_title'; @@ -6,7 +5,8 @@ import { Footer } from 'ts/components/old_footer'; import { TopBar } from 'ts/components/top_bar/top_bar'; import { Question } from 'ts/pages/faq/question'; import { Dispatcher } from 'ts/redux/dispatcher'; -import { FAQQuestion, FAQSection, WebsitePaths } from 'ts/types'; +import { FAQQuestion, FAQSection, Styles, WebsitePaths } from 'ts/types'; +import { colors } from 'ts/utils/colors'; import { configs } from 'ts/utils/configs'; import { constants } from 'ts/utils/constants'; import { documentConstants } from 'ts/utils/document_meta_constants'; diff --git a/packages/website/ts/pages/faq/question.tsx b/packages/website/ts/pages/faq/question.tsx index 413ffb6cef..11aa38817f 100644 --- a/packages/website/ts/pages/faq/question.tsx +++ b/packages/website/ts/pages/faq/question.tsx @@ -1,4 +1,4 @@ -import { colors } from '@0x/react-shared'; +import { colors } from 'ts/utils/colors'; import { Card, CardHeader, CardText } from 'material-ui/Card'; import * as React from 'react'; diff --git a/packages/website/ts/pages/instant.tsx b/packages/website/ts/pages/instant.tsx index 3e3ef1248e..be0dd6c0f8 100644 --- a/packages/website/ts/pages/instant.tsx +++ b/packages/website/ts/pages/instant.tsx @@ -1,4 +1,3 @@ -import { utils as sharedUtils } from '@0x/react-shared'; import * as _ from 'lodash'; import * as React from 'react'; import styled, { keyframes } from 'styled-components'; @@ -25,8 +24,8 @@ export const getStartedClick = () => { if (window.innerWidth < CONFIGURATOR_MIN_WIDTH_PX) { utils.openUrl(`${WebsitePaths.Wiki}#Get-Started-With-Instant`); } else { - sharedUtils.setUrlHash('configurator'); - sharedUtils.scrollToHash('configurator', ''); + utils.setUrlHash('configurator'); + utils.scrollToHash('configurator', ''); } }; diff --git a/packages/website/ts/pages/wiki/wiki.tsx b/packages/website/ts/pages/wiki/wiki.tsx index e83718e697..4393815e68 100644 --- a/packages/website/ts/pages/wiki/wiki.tsx +++ b/packages/website/ts/pages/wiki/wiki.tsx @@ -1,24 +1,18 @@ -import { - ALink, - colors, - constants as sharedConstants, - HeaderSizes, - Link, - MarkdownSection, - utils as sharedUtils, -} from '@0x/react-shared'; import { ObjectMap } from '@0x/types'; import * as _ from 'lodash'; import CircularProgress from 'material-ui/CircularProgress'; import * as React from 'react'; +import { Link } from 'ts/components/documentation/shared/link'; +import { MarkdownSection } from 'ts/components/documentation/shared/markdown_section'; import { SidebarHeader } from 'ts/components/documentation/sidebar_header'; import { NestedSidebarMenu } from 'ts/components/nested_sidebar_menu'; import { Button } from 'ts/components/ui/button'; import { Container } from 'ts/components/ui/container'; import { DevelopersPage } from 'ts/pages/documentation/developers_page'; import { Dispatcher } from 'ts/redux/dispatcher'; -import { Article, ArticlesBySection, Deco, Key, ScreenWidths } from 'ts/types'; +import { ALink, Article, ArticlesBySection, Deco, HeaderSizes, Key, ScreenWidths } from 'ts/types'; import { backendClient } from 'ts/utils/backend_client'; +import { colors } from 'ts/utils/colors'; import { constants } from 'ts/utils/constants'; import { Translate } from 'ts/utils/translate'; import { utils } from 'ts/utils/utils'; @@ -165,7 +159,7 @@ export class Wiki extends React.Component { async () => { await utils.onPageLoadPromise; const hash = this.props.location.hash.slice(1); - sharedUtils.scrollToHash(hash, sharedConstants.SCROLL_CONTAINER_ID); + utils.scrollToHash(hash, constants.SCROLL_CONTAINER_ID); }, ); } @@ -188,7 +182,7 @@ export class Wiki extends React.Component { const articles = articlesBySection[sectionName]; const articleLinks = _.map(articles, article => { return { - to: sharedUtils.getIdFromName(article.title), + to: utils.getIdFromName(article.title), title: article.title, }; }); diff --git a/packages/website/ts/style/colors.ts b/packages/website/ts/style/colors.ts index 356d72f7e6..29cd77a588 100644 --- a/packages/website/ts/style/colors.ts +++ b/packages/website/ts/style/colors.ts @@ -1,4 +1,4 @@ -import { colors as sharedColors } from '@0x/react-shared'; +import { colors as sharedColors } from 'ts/utils/colors'; const appColors = { walletBoxShadow: 'rgba(0, 0, 0, 0.05)', diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts index 64d2e94c49..ee23fd0049 100644 --- a/packages/website/ts/types.ts +++ b/packages/website/ts/types.ts @@ -1,4 +1,3 @@ -import { ALink } from '@0x/react-shared'; import { ObjectMap, SignedOrder } from '@0x/types'; import { BigNumber } from '@0x/utils'; import { Provider } from 'ethereum-types'; @@ -843,4 +842,37 @@ export enum AbiTypes { Function = 'function', Event = 'event', } +export interface Styles { + [name: string]: React.CSSProperties; +} + +export enum HeaderSizes { + H1 = 'h1', + H2 = 'h2', + H3 = 'h3', +} + +export enum EtherscanLinkSuffixes { + Address = 'address', + Tx = 'tx', +} + +export enum Networks { + Mainnet = 'Mainnet', + Kovan = 'Kovan', + Ropsten = 'Ropsten', + Rinkeby = 'Rinkeby', +} + +export enum LinkType { + External = 'EXTERNAL', + ReactScroll = 'REACT_SCROLL', + ReactRoute = 'REACT_ROUTE', +} + +export interface ALink { + title: string; + to: string; + shouldOpenInNewTab?: boolean; +} // tslint:disable:max-file-line-count diff --git a/packages/react-shared/src/utils/colors.ts b/packages/website/ts/utils/colors.ts similarity index 100% rename from packages/react-shared/src/utils/colors.ts rename to packages/website/ts/utils/colors.ts diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts index 558f589846..61cad96db7 100644 --- a/packages/website/ts/utils/constants.ts +++ b/packages/website/ts/utils/constants.ts @@ -1,6 +1,5 @@ -import { ALink } from '@0x/react-shared'; import { BigNumber } from '@0x/utils'; -import { Key, WebsitePaths } from 'ts/types'; +import { ALink, Key, Networks, WebsitePaths } from 'ts/types'; import { SupportedDocJson } from '../types'; @@ -140,4 +139,19 @@ export const constants = { [SupportedDocJson.SolDoc]: 'solidity', [SupportedDocJson.TypeDoc]: 'typescript', } as { [supportedDocType: string]: string }, + DOCS_SCROLL_DURATION_MS: 0, + SCROLL_CONTAINER_ID: 'scroll_container', + SCROLL_TOP_ID: 'pageScrollTop', + NETWORK_NAME_BY_ID: { + 1: Networks.Mainnet, + 3: Networks.Ropsten, + 4: Networks.Rinkeby, + 42: Networks.Kovan, + } as { [symbol: number]: string }, + NETWORK_ID_BY_NAME: { + [Networks.Mainnet]: 1, + [Networks.Ropsten]: 3, + [Networks.Rinkeby]: 4, + [Networks.Kovan]: 42, + } as { [networkName: string]: number }, }; diff --git a/packages/website/ts/utils/docs_info.ts b/packages/website/ts/utils/docs_info.ts index 1317129a6c..b270099980 100644 --- a/packages/website/ts/utils/docs_info.ts +++ b/packages/website/ts/utils/docs_info.ts @@ -1,6 +1,7 @@ -import { ALink, utils as sharedUtils } from '@0x/react-shared'; import { DocAgnosticFormat, ObjectMap, TypeDefinitionByName } from '@0x/types'; import * as _ from 'lodash'; +import { ALink } from 'ts/types'; +import { utils } from 'ts/utils/utils'; import { ContractsByVersionByNetworkId, @@ -50,7 +51,7 @@ export class DocsInfo { _.each(this.markdownMenu, (linkTitles, sectionName) => { sectionNameToLinks[sectionName] = []; _.each(linkTitles, linkTitle => { - const to = sharedUtils.getIdFromName(linkTitle); + const to = utils.getIdFromName(linkTitle); const links = sectionNameToLinks[sectionName]; links.push({ title: linkTitle, diff --git a/packages/website/ts/utils/mui_theme.ts b/packages/website/ts/utils/mui_theme.ts index 3f32254de9..b5a75acb43 100644 --- a/packages/website/ts/utils/mui_theme.ts +++ b/packages/website/ts/utils/mui_theme.ts @@ -1,4 +1,4 @@ -import { colors } from '@0x/react-shared'; +import { colors } from 'ts/utils/colors'; import { getMuiTheme } from 'material-ui/styles'; export const muiTheme = getMuiTheme({ diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index 5944e34c6b..46fde32cf6 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -1,14 +1,16 @@ import { ContractWrappersError } from '@0x/contract-wrappers'; import { assetDataUtils, TypedDataError } from '@0x/order-utils'; -import { constants as sharedConstants, Networks } from '@0x/react-shared'; import { ExchangeContractErrs } from '@0x/types'; import { BigNumber } from '@0x/utils'; import { Web3Wrapper } from '@0x/web3-wrapper'; import * as bowser from 'bowser'; +import * as changeCase from 'change-case'; import deepEqual from 'deep-equal'; +import isMobile from 'is-mobile'; import * as _ from 'lodash'; import * as moment from 'moment'; import * as numeral from 'numeral'; +import { scroller } from 'react-scroll'; import { ZeroExProvider } from 'ethereum-types'; import { @@ -16,6 +18,8 @@ import { BlockchainCallErrs, BrowserType, Environments, + EtherscanLinkSuffixes, + Networks, OperatingSystemType, PortalOrder, Providers, @@ -277,9 +281,9 @@ export const utils = { isTestNetwork(networkId: number): boolean { const isTestNetwork = _.includes( [ - sharedConstants.NETWORK_ID_BY_NAME[Networks.Kovan], - sharedConstants.NETWORK_ID_BY_NAME[Networks.Rinkeby], - sharedConstants.NETWORK_ID_BY_NAME[Networks.Ropsten], + constants.NETWORK_ID_BY_NAME[Networks.Kovan], + constants.NETWORK_ID_BY_NAME[Networks.Rinkeby], + constants.NETWORK_ID_BY_NAME[Networks.Ropsten], ], networkId, ); @@ -483,4 +487,45 @@ export const utils = { const result = `/images/token_icons/${symbol}.png`; return result; }, + setUrlHash(anchorId: string): void { + window.location.hash = anchorId; + }, + scrollToHash(hash: string, containerId: string): void { + let finalHash = hash; + if (_.isEmpty(hash)) { + finalHash = constants.SCROLL_TOP_ID; // scroll to the top + } + + scroller.scrollTo(finalHash, { + duration: 0, + offset: 0, + containerId, + }); + }, + isUserOnMobile(): boolean { + const isUserOnMobile = isMobile(); + return isUserOnMobile; + }, + getIdFromName(name: string): string { + const id = name.replace(/ /g, '-'); + return id; + }, + convertDashesToSpaces(text: string): string { + return text.replace(/-/g, ' '); + }, + convertCamelCaseToSpaces(text: string): string { + return changeCase.snake(text).replace(/_/g, ' '); + }, + getEtherScanLinkIfExists( + addressOrTxHash: string, + networkId: number, + suffix: EtherscanLinkSuffixes, + ): string | undefined { + const networkName = constants.NETWORK_NAME_BY_ID[networkId]; + if (networkName === undefined) { + return undefined; + } + const etherScanPrefix = networkName === Networks.Mainnet ? '' : `${networkName.toLowerCase()}.`; + return `https://${etherScanPrefix}etherscan.io/${suffix}/${addressOrTxHash}`; + }, }; diff --git a/yarn.lock b/yarn.lock index 68d9fdb908..31c8adece7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -863,12 +863,6 @@ core-js "^2.6.5" regenerator-runtime "^0.13.2" -"@babel/runtime@7.0.0", "@babel/runtime@^7.0.0": - version "7.0.0" - resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c" - dependencies: - regenerator-runtime "^0.12.0" - "@babel/runtime@7.0.0-rc.1": version "7.0.0-rc.1" resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-rc.1.tgz#42f36fc5817911c89ea75da2b874054922967616" @@ -1546,38 +1540,6 @@ "@loopback/dist-util" "^0.3.6" openapi3-ts "^0.11.0" -"@material-ui/core@^3.0.1": - version "3.0.1" - resolved "https://registry.npmjs.org/@material-ui/core/-/core-3.0.1.tgz#e8476394a42d89ae404355ddbc093db4d044b225" - dependencies: - "@babel/runtime" "7.0.0" - "@types/jss" "^9.5.3" - "@types/react-transition-group" "^2.0.8" - brcast "^3.0.1" - classnames "^2.2.5" - csstype "^2.5.2" - debounce "^1.1.0" - deepmerge "^2.0.1" - dom-helpers "^3.2.1" - hoist-non-react-statics "^2.5.0" - is-plain-object "^2.0.4" - jss "^9.3.3" - jss-camel-case "^6.0.0" - jss-default-unit "^8.0.2" - jss-global "^3.0.0" - jss-nested "^6.0.1" - jss-props-sort "^6.0.0" - jss-vendor-prefixer "^7.0.0" - keycode "^2.1.9" - normalize-scroll-left "^0.1.2" - popper.js "^1.14.1" - prop-types "^15.6.0" - react-event-listener "^0.6.2" - react-jss "^8.1.0" - react-transition-group "^2.2.1" - recompose "^0.29.0" - warning "^4.0.1" - "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" @@ -1865,13 +1827,6 @@ dependencies: jsonschema "*" -"@types/jss@^9.5.3": - version "9.5.4" - resolved "https://registry.npmjs.org/@types/jss/-/jss-9.5.4.tgz#89a4ee32a14a8d2937187b1a7f443750e964a74d" - dependencies: - csstype "^2.0.0" - indefinite-observable "^1.0.1" - "@types/lodash.foreach@^4.5.3": version "4.5.3" resolved "https://registry.yarnpkg.com/@types/lodash.foreach/-/lodash.foreach-4.5.3.tgz#87c01a0c5d9d17eec936ca3c28897af79440cdfc" @@ -1992,7 +1947,7 @@ dependencies: "@types/react" "*" -"@types/react-dom@*", "@types/react-dom@16.0.6": +"@types/react-dom@16.0.6": version "16.0.6" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.6.tgz#f1a65a4e7be8ed5d123f8b3b9eacc913e35a1a3c" dependencies: @@ -2088,12 +2043,6 @@ version "0.0.30" resolved "https://registry.yarnpkg.com/@types/react-tap-event-plugin/-/react-tap-event-plugin-0.0.30.tgz#123f35080412f489b6770c5a65c159ff96654cb5" -"@types/react-transition-group@^2.0.8": - version "2.0.13" - resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.0.13.tgz#7769fb61eb71d64d087a713956f086a42c3ee171" - dependencies: - "@types/react" "*" - "@types/react@*", "@types/react@16.4.16": version "16.4.16" resolved "https://registry.npmjs.org/@types/react/-/react-16.4.16.tgz#99f91b1200ae8c2062030402006d3b3c3a177043" @@ -4015,16 +3964,6 @@ braces@^2.3.1, braces@^2.3.2: split-string "^3.0.2" to-regex "^3.0.1" -braces@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - dependencies: - fill-range "^7.0.1" - -brcast@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/brcast/-/brcast-3.0.1.tgz#6256a8349b20de9eed44257a9b24d71493cd48dd" - broadway@~0.3.2, broadway@~0.3.6: version "0.3.6" resolved "https://registry.yarnpkg.com/broadway/-/broadway-0.3.6.tgz#7dbef068b954b7907925fd544963b578a902ba7a" @@ -5602,12 +5541,6 @@ css-to-react-native@^2.2.2: fbjs "^0.8.5" postcss-value-parser "^3.3.0" -css-vendor@^0.3.8: - version "0.3.8" - resolved "https://registry.npmjs.org/css-vendor/-/css-vendor-0.3.8.tgz#6421cfd3034ce664fe7673972fd0119fc28941fa" - dependencies: - is-in-browser "^1.0.2" - css-what@2.1: version "2.1.0" resolved "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd" @@ -5679,10 +5612,6 @@ cssstyle@^1.0.0: dependencies: cssom "0.3.x" -csstype@^2.0.0, csstype@^2.5.2: - version "2.5.6" - resolved "https://registry.npmjs.org/csstype/-/csstype-2.5.6.tgz#2ae1db2319642d8b80a668d2d025c6196071e788" - csstype@^2.2.0: version "2.4.2" resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.4.2.tgz#158e36c69566bf968da63d0ba14eda1c20e8643a" @@ -5743,10 +5672,6 @@ dateformat@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" -debounce@^1.1.0: - version "1.2.0" - resolved "https://registry.npmjs.org/debounce/-/debounce-1.2.0.tgz#44a540abc0ea9943018dc0eaa95cce87f65cd131" - debug-log@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f" @@ -5902,10 +5827,6 @@ deepmerge@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.0.0.tgz#3e3110ca29205f120d7cb064960a39c3d2087c09" -deepmerge@^2.0.1: - version "2.1.1" - resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768" - default-gateway@^2.6.0: version "2.7.2" resolved "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f" @@ -6189,7 +6110,7 @@ dom-converter@~0.2: dependencies: utila "~0.4" -dom-helpers@^3.2.0, dom-helpers@^3.2.1, dom-helpers@^3.3.1: +dom-helpers@^3.2.0: version "3.3.1" resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.3.1.tgz#fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6" @@ -9196,12 +9117,6 @@ imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" -indefinite-observable@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-1.0.1.tgz#09915423cc8d6f7eb1cb7882ad134633c9a6edc3" - dependencies: - symbol-observable "1.0.4" - indent-string@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" @@ -9596,10 +9511,6 @@ is-hexadecimal@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz#6e084bbc92061fbb0971ec58b6ce6d404e24da69" -is-in-browser@^1.0.2, is-in-browser@^1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835" - is-installed-globally@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" @@ -10532,81 +10443,6 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jss-camel-case@^6.0.0, jss-camel-case@^6.1.0: - version "6.1.0" - resolved "https://registry.npmjs.org/jss-camel-case/-/jss-camel-case-6.1.0.tgz#ccb1ff8d6c701c02a1fed6fb6fb6b7896e11ce44" - dependencies: - hyphenate-style-name "^1.0.2" - -jss-compose@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/jss-compose/-/jss-compose-5.0.0.tgz#ce01b2e4521d65c37ea42cf49116e5f7ab596484" - dependencies: - warning "^3.0.0" - -jss-default-unit@^8.0.2: - version "8.0.2" - resolved "https://registry.npmjs.org/jss-default-unit/-/jss-default-unit-8.0.2.tgz#cc1e889bae4c0b9419327b314ab1c8e2826890e6" - -jss-expand@^5.3.0: - version "5.3.0" - resolved "https://registry.npmjs.org/jss-expand/-/jss-expand-5.3.0.tgz#02be076efe650125c842f5bb6fb68786fe441ed6" - -jss-extend@^6.2.0: - version "6.2.0" - resolved "https://registry.npmjs.org/jss-extend/-/jss-extend-6.2.0.tgz#4af09d0b72fb98ee229970f8ca852fec1ca2a8dc" - dependencies: - warning "^3.0.0" - -jss-global@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/jss-global/-/jss-global-3.0.0.tgz#e19e5c91ab2b96353c227e30aa2cbd938cdaafa2" - -jss-nested@^6.0.1: - version "6.0.1" - resolved "https://registry.npmjs.org/jss-nested/-/jss-nested-6.0.1.tgz#ef992b79d6e8f63d939c4397b9d99b5cbbe824ca" - dependencies: - warning "^3.0.0" - -jss-preset-default@^4.3.0: - version "4.5.0" - resolved "https://registry.npmjs.org/jss-preset-default/-/jss-preset-default-4.5.0.tgz#d3a457012ccd7a551312014e394c23c4b301cadd" - dependencies: - jss-camel-case "^6.1.0" - jss-compose "^5.0.0" - jss-default-unit "^8.0.2" - jss-expand "^5.3.0" - jss-extend "^6.2.0" - jss-global "^3.0.0" - jss-nested "^6.0.1" - jss-props-sort "^6.0.0" - jss-template "^1.0.1" - jss-vendor-prefixer "^7.0.0" - -jss-props-sort@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/jss-props-sort/-/jss-props-sort-6.0.0.tgz#9105101a3b5071fab61e2d85ea74cc22e9b16323" - -jss-template@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/jss-template/-/jss-template-1.0.1.tgz#09aed9d86cc547b07f53ef355d7e1777f7da430a" - dependencies: - warning "^3.0.0" - -jss-vendor-prefixer@^7.0.0: - version "7.0.0" - resolved "https://registry.npmjs.org/jss-vendor-prefixer/-/jss-vendor-prefixer-7.0.0.tgz#0166729650015ef19d9f02437c73667231605c71" - dependencies: - css-vendor "^0.3.8" - -jss@^9.3.3, jss@^9.7.0: - version "9.8.7" - resolved "https://registry.npmjs.org/jss/-/jss-9.8.7.tgz#ed9763fc0f2f0260fc8260dac657af61e622ce05" - dependencies: - is-in-browser "^1.1.3" - symbol-observable "^1.1.0" - warning "^3.0.0" - jump.js@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/jump.js/-/jump.js-1.0.1.tgz#0de2b1631ba9a1c2c6b8572ad277d877e8503600" @@ -10631,7 +10467,7 @@ keccakjs@^0.2.0, keccakjs@^0.2.1: browserify-sha3 "^0.0.1" sha3 "^1.1.0" -keycode@^2.1.8, keycode@^2.1.9: +keycode@^2.1.8: version "2.2.0" resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04" @@ -12455,10 +12291,6 @@ normalize-range@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" -normalize-scroll-left@^0.1.2: - version "0.1.2" - resolved "https://registry.npmjs.org/normalize-scroll-left/-/normalize-scroll-left-0.1.2.tgz#6b79691ba79eb5fb107fa5edfbdc06b55caee2aa" - normalize-url@^1.4.0: version "1.9.1" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" @@ -14481,16 +14313,6 @@ react-is@^16.6.0: version "16.6.3" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.6.3.tgz#d2d7462fcfcbe6ec0da56ad69047e47e56e7eac0" -react-jss@^8.1.0: - version "8.6.1" - resolved "https://registry.npmjs.org/react-jss/-/react-jss-8.6.1.tgz#a06e2e1d2c4d91b4d11befda865e6c07fbd75252" - dependencies: - hoist-non-react-statics "^2.5.0" - jss "^9.7.0" - jss-preset-default "^4.3.0" - prop-types "^15.6.0" - theming "^1.3.0" - react-lazyload@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/react-lazyload/-/react-lazyload-2.3.0.tgz#ccb134223012447074a96543954f44b055dc6185" @@ -14512,16 +14334,6 @@ react-lottie@^1.2.3: babel-runtime "^6.26.0" lottie-web "^5.1.3" -react-markdown@^3.2.2: - version "3.3.0" - resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-3.3.0.tgz#a87cdd822aa9302d6add9687961dd1a82a45d02e" - dependencies: - prop-types "^15.6.1" - remark-parse "^5.0.0" - unified "^6.1.5" - unist-util-visit "^1.3.0" - xtend "^4.0.1" - react-markdown@^4.0.6: version "4.0.6" resolved "https://registry.npmjs.org/react-markdown/-/react-markdown-4.0.6.tgz#927d44421735cd90b7634bb221e9d7d8656e01e9" @@ -14677,15 +14489,6 @@ react-transition-group@^1.2.1: prop-types "^15.5.6" warning "^3.0.0" -react-transition-group@^2.2.1: - version "2.4.0" - resolved "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz#1d9391fabfd82e016f26fabd1eec329dbd922b5a" - dependencies: - dom-helpers "^3.3.1" - loose-envify "^1.3.1" - prop-types "^15.6.2" - react-lifecycles-compat "^3.0.4" - react-typist@^2.0.4: version "2.0.4" resolved "https://registry.npmjs.org/react-typist/-/react-typist-2.0.4.tgz#e7ee4de53ead913d363d38f07b700c00ce271be0" @@ -14894,17 +14697,6 @@ recompose@^0.26.0: hoist-non-react-statics "^2.3.1" symbol-observable "^1.0.4" -recompose@^0.29.0: - version "0.29.0" - resolved "https://registry.npmjs.org/recompose/-/recompose-0.29.0.tgz#f1a4e20d5f24d6ef1440f83924e821de0b1bccef" - dependencies: - "@babel/runtime" "^7.0.0" - change-emitter "^0.1.2" - fbjs "^0.8.1" - hoist-non-react-statics "^2.3.1" - react-lifecycles-compat "^3.0.2" - symbol-observable "^1.0.4" - redent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" @@ -16770,10 +16562,6 @@ symbol-observable@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" -symbol-observable@1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d" - symbol-observable@^1.0.3, symbol-observable@^1.0.4, symbol-observable@^1.1.0, symbol-observable@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" @@ -16987,15 +16775,6 @@ text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" -theming@^1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/theming/-/theming-1.3.0.tgz#286d5bae80be890d0adc645e5ca0498723725bdc" - dependencies: - brcast "^3.0.1" - is-function "^1.0.1" - is-plain-object "^2.0.1" - prop-types "^15.5.8" - thenby@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/thenby/-/thenby-1.2.3.tgz#62465b07e3d8b9466f01026df837f738e0faaa69" From 24a26aef709caf428d80c2e0d0cf2ba7b0110186 Mon Sep 17 00:00:00 2001 From: fabioberger Date: Thu, 25 Jul 2019 11:33:02 +0200 Subject: [PATCH 3/4] Remove remaining references to react-shared --- README.md | 1 - packages/monorepo-scripts/src/test_installation.ts | 2 +- tsconfig.json | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index c061e7a07d..8ad6bf5b9a 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,6 @@ These packages are all under development. See [/contracts/README.md](/contracts/ | [`@0x/types`](/packages/types) | [![npm](https://img.shields.io/npm/v/@0x/types.svg)](https://www.npmjs.com/package/@0x/types) | Shared type declarations | | [`@0x/typescript-typings`](/packages/typescript-typings) | [![npm](https://img.shields.io/npm/v/@0x/typescript-typings.svg)](https://www.npmjs.com/package/@0x/typescript-typings) | Repository of types for external packages | | [`@0x/utils`](/packages/utils) | [![npm](https://img.shields.io/npm/v/@0x/utils.svg)](https://www.npmjs.com/package/@0x/utils) | Shared utilities | -| [`@0x/react-shared`](/packages/react-shared) | [![npm](https://img.shields.io/npm/v/@0x/react-shared.svg)](https://www.npmjs.com/package/@0x/react-shared) | 0x shared react components | | [`@0x/assert`](/packages/assert) | [![npm](https://img.shields.io/npm/v/@0x/assert.svg)](https://www.npmjs.com/package/@0x/assert) | Type and schema assertions used by our packages | | [`@0x/base-contract`](/packages/base-contract) | [![npm](https://img.shields.io/npm/v/@0x/base-contract.svg)](https://www.npmjs.com/package/@0x/base-contract) | BaseContract used by auto-generated `abi-gen` wrapper contracts | | [`@0x/dev-utils`](/packages/dev-utils) | [![npm](https://img.shields.io/npm/v/@0x/dev-utils.svg)](https://www.npmjs.com/package/@0x/dev-utils) | Dev utils to be shared across 0x packages | diff --git a/packages/monorepo-scripts/src/test_installation.ts b/packages/monorepo-scripts/src/test_installation.ts index 1591853e7d..4ad135996a 100644 --- a/packages/monorepo-scripts/src/test_installation.ts +++ b/packages/monorepo-scripts/src/test_installation.ts @@ -12,7 +12,7 @@ import { Changelog, Package } from './types'; import { utils } from './utils/utils'; // Packages might not be runnable if they are command-line tools or only run in browsers. -const UNRUNNABLE_PACKAGES = ['@0x/abi-gen', '@0x/react-shared']; +const UNRUNNABLE_PACKAGES = ['@0x/abi-gen']; const mkdirpAsync = promisify(mkdirp); const rimrafAsync = promisify(rimraf); diff --git a/tsconfig.json b/tsconfig.json index 6e723a7f37..7c4ea8f832 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -50,7 +50,6 @@ { "path": "./packages/monorepo-scripts" }, { "path": "./packages/order-utils" }, { "path": "./packages/order-watcher" }, - { "path": "./packages/react-shared" }, { "path": "./packages/sol-compiler" }, { "path": "./packages/sol-coverage" }, { "path": "./packages/sol-profiler" }, From fbda096aa9e315dbed7f01ea52869c68b0dc3290 Mon Sep 17 00:00:00 2001 From: fabioberger Date: Thu, 25 Jul 2019 12:21:53 +0200 Subject: [PATCH 4/4] Fix linter errors --- packages/website/ts/components/footer.tsx | 2 +- packages/website/ts/components/header.tsx | 2 +- packages/website/ts/components/inputs/token_input.tsx | 2 +- .../ts/components/onboarding/install_wallet_onboarding_step.tsx | 2 +- packages/website/ts/components/portal/back_button.tsx | 2 +- packages/website/ts/components/portal/portal.tsx | 2 +- packages/website/ts/components/portal/text_header.tsx | 2 +- packages/website/ts/components/top_bar/top_bar_menu_item.tsx | 2 +- packages/website/ts/components/track_token_confirmation.tsx | 2 +- packages/website/ts/components/ui/copy_icon.tsx | 2 +- packages/website/ts/components/ui/custom_menu_item.tsx | 2 +- packages/website/ts/components/ui/lifecycle_raised_button.tsx | 2 +- packages/website/ts/components/ui/multi_select.tsx | 2 +- packages/website/ts/components/ui/pointer.tsx | 2 +- packages/website/ts/components/ui/required_label.tsx | 2 +- packages/website/ts/components/ui/simple_menu.tsx | 2 +- packages/website/ts/components/ui/spinner.tsx | 2 +- packages/website/ts/components/ui/swap_icon.tsx | 2 +- packages/website/ts/components/ui/text.tsx | 2 +- packages/website/ts/pages/faq/question.tsx | 2 +- packages/website/ts/utils/mui_theme.ts | 2 +- packages/website/ts/utils/utils.ts | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx index 5cf727b0e0..a1c8dd4f6f 100644 --- a/packages/website/ts/components/footer.tsx +++ b/packages/website/ts/components/footer.tsx @@ -3,9 +3,9 @@ import * as React from 'react'; import MediaQuery from 'react-responsive'; import styled from 'styled-components'; +import { Link as SmartLink } from 'ts/components/documentation/shared/link'; import { Logo } from 'ts/components/logo'; import { Column, FlexWrap, WrapGrid } from 'ts/components/newLayout'; -import { Link as SmartLink } from 'ts/components/documentation/shared/link'; import { NewsletterForm } from 'ts/components/newsletter_form'; import { WebsitePaths } from 'ts/types'; import { constants } from 'ts/utils/constants'; diff --git a/packages/website/ts/components/header.tsx b/packages/website/ts/components/header.tsx index 8f1f60f5f2..2f0486b685 100644 --- a/packages/website/ts/components/header.tsx +++ b/packages/website/ts/components/header.tsx @@ -1,8 +1,8 @@ -import { Link } from 'ts/components/documentation/shared/link'; import _ from 'lodash'; import * as React from 'react'; import MediaQuery from 'react-responsive'; import styled, { css, withTheme } from 'styled-components'; +import { Link } from 'ts/components/documentation/shared/link'; import Headroom from 'react-headroom'; diff --git a/packages/website/ts/components/inputs/token_input.tsx b/packages/website/ts/components/inputs/token_input.tsx index 237bf83eeb..c317c553ba 100644 --- a/packages/website/ts/components/inputs/token_input.tsx +++ b/packages/website/ts/components/inputs/token_input.tsx @@ -1,4 +1,3 @@ -import { colors } from 'ts/utils/colors'; import Paper from 'material-ui/Paper'; import * as React from 'react'; import { Blockchain } from 'ts/blockchain'; @@ -7,6 +6,7 @@ import { InputLabel } from 'ts/components/ui/input_label'; import { TokenIcon } from 'ts/components/ui/token_icon'; import { Dispatcher } from 'ts/redux/dispatcher'; import { AssetToken, BlockchainErrs, Side, Token, TokenByAddress } from 'ts/types'; +import { colors } from 'ts/utils/colors'; const TOKEN_ICON_DIMENSION = 80; diff --git a/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx b/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx index 46aaee5886..b52069a7cc 100644 --- a/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx +++ b/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx @@ -1,8 +1,8 @@ -import { colors } from 'ts/utils/colors'; import * as React from 'react'; import { Container } from 'ts/components/ui/container'; import { Image } from 'ts/components/ui/image'; import { Text } from 'ts/components/ui/text'; +import { colors } from 'ts/utils/colors'; import { utils } from 'ts/utils/utils'; export interface InstallWalletOnboardingStepProps {} diff --git a/packages/website/ts/components/portal/back_button.tsx b/packages/website/ts/components/portal/back_button.tsx index 9393bd95a9..ed15c37426 100644 --- a/packages/website/ts/components/portal/back_button.tsx +++ b/packages/website/ts/components/portal/back_button.tsx @@ -1,5 +1,5 @@ -import { Link } from 'ts/components/documentation/shared/link'; import * as React from 'react'; +import { Link } from 'ts/components/documentation/shared/link'; import { Island } from 'ts/components/ui/island'; import { colors } from 'ts/style/colors'; import { Styles } from 'ts/types'; diff --git a/packages/website/ts/components/portal/portal.tsx b/packages/website/ts/components/portal/portal.tsx index 5a72d9dba4..e26cf2bf8c 100644 --- a/packages/website/ts/components/portal/portal.tsx +++ b/packages/website/ts/components/portal/portal.tsx @@ -1,8 +1,8 @@ -import { Link } from 'ts/components/documentation/shared/link'; import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import * as React from 'react'; import { Redirect, Route, RouteComponentProps, Switch } from 'react-router-dom'; +import { Link } from 'ts/components/documentation/shared/link'; import { colors } from 'ts/style/colors'; import { Blockchain } from 'ts/blockchain'; diff --git a/packages/website/ts/components/portal/text_header.tsx b/packages/website/ts/components/portal/text_header.tsx index 8b225e3811..ce9522cf87 100644 --- a/packages/website/ts/components/portal/text_header.tsx +++ b/packages/website/ts/components/portal/text_header.tsx @@ -1,5 +1,5 @@ -import { colors } from 'ts/utils/colors'; import * as React from 'react'; +import { colors } from 'ts/utils/colors'; import { Text } from 'ts/components/ui/text'; diff --git a/packages/website/ts/components/top_bar/top_bar_menu_item.tsx b/packages/website/ts/components/top_bar/top_bar_menu_item.tsx index 729b52fc97..61c2383ace 100644 --- a/packages/website/ts/components/top_bar/top_bar_menu_item.tsx +++ b/packages/website/ts/components/top_bar/top_bar_menu_item.tsx @@ -1,6 +1,6 @@ -import { Link } from 'ts/components/documentation/shared/link'; import * as _ from 'lodash'; import * as React from 'react'; +import { Link } from 'ts/components/documentation/shared/link'; import { colors } from 'ts/style/colors'; import { CallToAction } from 'ts/components/ui/button'; diff --git a/packages/website/ts/components/track_token_confirmation.tsx b/packages/website/ts/components/track_token_confirmation.tsx index 4108d7e35c..307f16455b 100644 --- a/packages/website/ts/components/track_token_confirmation.tsx +++ b/packages/website/ts/components/track_token_confirmation.tsx @@ -1,8 +1,8 @@ -import { colors } from 'ts/utils/colors'; import * as _ from 'lodash'; import * as React from 'react'; import { Party } from 'ts/components/ui/party'; import { Token, TokenByAddress } from 'ts/types'; +import { colors } from 'ts/utils/colors'; import { utils } from 'ts/utils/utils'; interface TrackTokenConfirmationProps { diff --git a/packages/website/ts/components/ui/copy_icon.tsx b/packages/website/ts/components/ui/copy_icon.tsx index c24b483ed4..efae7802cd 100644 --- a/packages/website/ts/components/ui/copy_icon.tsx +++ b/packages/website/ts/components/ui/copy_icon.tsx @@ -1,8 +1,8 @@ -import { colors } from 'ts/utils/colors'; import * as React from 'react'; import * as CopyToClipboard from 'react-copy-to-clipboard'; import * as ReactDOM from 'react-dom'; import ReactTooltip from 'react-tooltip'; +import { colors } from 'ts/utils/colors'; interface CopyIconProps { data: string; diff --git a/packages/website/ts/components/ui/custom_menu_item.tsx b/packages/website/ts/components/ui/custom_menu_item.tsx index 9c9698b801..e8105bec23 100644 --- a/packages/website/ts/components/ui/custom_menu_item.tsx +++ b/packages/website/ts/components/ui/custom_menu_item.tsx @@ -1,6 +1,6 @@ -import { Link } from 'ts/components/documentation/shared/link'; import * as _ from 'lodash'; import * as React from 'react'; +import { Link } from 'ts/components/documentation/shared/link'; interface CustomMenuItemProps { to: string; diff --git a/packages/website/ts/components/ui/lifecycle_raised_button.tsx b/packages/website/ts/components/ui/lifecycle_raised_button.tsx index 08c2742059..f294b58d11 100644 --- a/packages/website/ts/components/ui/lifecycle_raised_button.tsx +++ b/packages/website/ts/components/ui/lifecycle_raised_button.tsx @@ -1,7 +1,7 @@ -import { colors } from 'ts/utils/colors'; import { errorUtils } from '@0x/utils'; import RaisedButton from 'material-ui/RaisedButton'; import * as React from 'react'; +import { colors } from 'ts/utils/colors'; const COMPLETE_STATE_SHOW_LENGTH_MS = 2000; diff --git a/packages/website/ts/components/ui/multi_select.tsx b/packages/website/ts/components/ui/multi_select.tsx index 70b5431f58..dad0642ad0 100644 --- a/packages/website/ts/components/ui/multi_select.tsx +++ b/packages/website/ts/components/ui/multi_select.tsx @@ -1,6 +1,6 @@ -import { colors } from 'ts/utils/colors'; import * as _ from 'lodash'; import * as React from 'react'; +import { colors } from 'ts/utils/colors'; import { Container } from './container'; diff --git a/packages/website/ts/components/ui/pointer.tsx b/packages/website/ts/components/ui/pointer.tsx index 013c29fefe..c478887d43 100644 --- a/packages/website/ts/components/ui/pointer.tsx +++ b/packages/website/ts/components/ui/pointer.tsx @@ -1,6 +1,6 @@ -import { colors } from 'ts/utils/colors'; import * as React from 'react'; import { styled } from 'ts/style/theme'; +import { colors } from 'ts/utils/colors'; export enum PointerDirection { Top = 'top', diff --git a/packages/website/ts/components/ui/required_label.tsx b/packages/website/ts/components/ui/required_label.tsx index cc46b32697..a5e7a22cec 100644 --- a/packages/website/ts/components/ui/required_label.tsx +++ b/packages/website/ts/components/ui/required_label.tsx @@ -1,5 +1,5 @@ -import { colors } from 'ts/utils/colors'; import * as React from 'react'; +import { colors } from 'ts/utils/colors'; export interface RequiredLabelProps { label: string | React.ReactNode; diff --git a/packages/website/ts/components/ui/simple_menu.tsx b/packages/website/ts/components/ui/simple_menu.tsx index e44af6db1b..0964de03fa 100644 --- a/packages/website/ts/components/ui/simple_menu.tsx +++ b/packages/website/ts/components/ui/simple_menu.tsx @@ -1,7 +1,7 @@ -import { Link } from 'ts/components/documentation/shared/link'; import * as _ from 'lodash'; import * as React from 'react'; import * as CopyToClipboard from 'react-copy-to-clipboard'; +import { Link } from 'ts/components/documentation/shared/link'; import { Container } from 'ts/components/ui/container'; import { Text } from 'ts/components/ui/text'; diff --git a/packages/website/ts/components/ui/spinner.tsx b/packages/website/ts/components/ui/spinner.tsx index a18620d6e9..d31a1a99de 100644 --- a/packages/website/ts/components/ui/spinner.tsx +++ b/packages/website/ts/components/ui/spinner.tsx @@ -1,6 +1,6 @@ -import { colors } from 'ts/utils/colors'; import * as React from 'react'; import { styled } from 'ts/style/theme'; +import { colors } from 'ts/utils/colors'; import { dash, rotate } from 'ts/style/keyframes'; diff --git a/packages/website/ts/components/ui/swap_icon.tsx b/packages/website/ts/components/ui/swap_icon.tsx index 87b91217b8..5c76b0f2c6 100644 --- a/packages/website/ts/components/ui/swap_icon.tsx +++ b/packages/website/ts/components/ui/swap_icon.tsx @@ -1,5 +1,5 @@ -import { colors } from 'ts/utils/colors'; import * as React from 'react'; +import { colors } from 'ts/utils/colors'; interface SwapIconProps { swapTokensFn: () => void; diff --git a/packages/website/ts/components/ui/text.tsx b/packages/website/ts/components/ui/text.tsx index d8029e933e..f0436e4ada 100644 --- a/packages/website/ts/components/ui/text.tsx +++ b/packages/website/ts/components/ui/text.tsx @@ -1,7 +1,7 @@ -import { colors } from 'ts/utils/colors'; import { darken } from 'polished'; import * as React from 'react'; import { styled } from 'ts/style/theme'; +import { colors } from 'ts/utils/colors'; export type TextTag = 'p' | 'div' | 'span' | 'label' | 'h1' | 'h2' | 'h3' | 'h4' | 'i' | 'span'; diff --git a/packages/website/ts/pages/faq/question.tsx b/packages/website/ts/pages/faq/question.tsx index 11aa38817f..2f69c1d0e7 100644 --- a/packages/website/ts/pages/faq/question.tsx +++ b/packages/website/ts/pages/faq/question.tsx @@ -1,6 +1,6 @@ -import { colors } from 'ts/utils/colors'; import { Card, CardHeader, CardText } from 'material-ui/Card'; import * as React from 'react'; +import { colors } from 'ts/utils/colors'; export interface QuestionProps { prompt: string; diff --git a/packages/website/ts/utils/mui_theme.ts b/packages/website/ts/utils/mui_theme.ts index b5a75acb43..151a68eafb 100644 --- a/packages/website/ts/utils/mui_theme.ts +++ b/packages/website/ts/utils/mui_theme.ts @@ -1,5 +1,5 @@ -import { colors } from 'ts/utils/colors'; import { getMuiTheme } from 'material-ui/styles'; +import { colors } from 'ts/utils/colors'; export const muiTheme = getMuiTheme({ appBar: { diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index 46fde32cf6..86e5b1fe78 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -528,4 +528,4 @@ export const utils = { const etherScanPrefix = networkName === Networks.Mainnet ? '' : `${networkName.toLowerCase()}.`; return `https://${etherScanPrefix}etherscan.io/${suffix}/${addressOrTxHash}`; }, -}; +}; // tslint:disable:max-file-line-count