diff options
| author | F. Eugene Aumson <gene@aumson.org> | 2018-08-31 21:22:05 +0800 |
|---|---|---|
| committer | F. Eugene Aumson <gene@aumson.org> | 2018-08-31 21:22:05 +0800 |
| commit | 72419816a88d6afcf8727cefe69e3a2fbe479f55 (patch) | |
| tree | 076252c005a879c4ea122d467348d1097e41a574 /packages/react-docs | |
| parent | 9a4e6da02f606e97b470a6545b2ce5baf14b03e6 (diff) | |
| parent | 675964dc5c6c44eb07023fd036857ecd3f14dcf3 (diff) | |
| download | dexon-sol-tools-72419816a88d6afcf8727cefe69e3a2fbe479f55.tar dexon-sol-tools-72419816a88d6afcf8727cefe69e3a2fbe479f55.tar.gz dexon-sol-tools-72419816a88d6afcf8727cefe69e3a2fbe479f55.tar.bz2 dexon-sol-tools-72419816a88d6afcf8727cefe69e3a2fbe479f55.tar.lz dexon-sol-tools-72419816a88d6afcf8727cefe69e3a2fbe479f55.tar.xz dexon-sol-tools-72419816a88d6afcf8727cefe69e3a2fbe479f55.tar.zst dexon-sol-tools-72419816a88d6afcf8727cefe69e3a2fbe479f55.zip | |
Merge remote-tracking branch 'upstream/development' into sol-doc
Diffstat (limited to 'packages/react-docs')
| -rw-r--r-- | packages/react-docs/package.json | 11 | ||||
| -rw-r--r-- | packages/react-docs/src/docs_info.ts | 1 | ||||
| -rw-r--r-- | packages/react-docs/tsconfig.json | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index adc06a501..d500601fd 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -9,8 +9,7 @@ "types": "lib/index.d.ts", "scripts": { "lint": "tslint --project .", - "build": "tsc", - "watch_without_deps": "tsc -w", + "build": "tsc -b", "clean": "shx rm -rf lib" }, "author": "Fabio Berger", @@ -38,7 +37,7 @@ "@0xproject/types": "^1.0.1-rc.6", "@0xproject/utils": "^1.0.7", "@types/lodash": "4.14.104", - "@types/material-ui": "0.18.0", + "@types/material-ui": "^0.20.0", "@types/node": "^8.0.53", "@types/react": "*", "@types/react-dom": "*", @@ -46,9 +45,9 @@ "basscss": "^8.0.3", "compare-versions": "^3.0.1", "lodash": "^4.17.5", - "material-ui": "^0.17.1", - "react": "15.6.1", - "react-dom": "15.6.1", + "material-ui": "^0.20.0", + "react": "^16.4.2", + "react-dom": "^16.4.2", "react-markdown": "^3.2.2", "react-scroll": "0xproject/react-scroll#similar-to-pr-330", "react-tooltip": "^3.2.7", diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts index f9137d69d..fa5aa0da3 100644 --- a/packages/react-docs/src/docs_info.ts +++ b/packages/react-docs/src/docs_info.ts @@ -1,6 +1,5 @@ import { MenuSubsectionsBySection } from '@0xproject/react-shared'; import { DocAgnosticFormat, GeneratedDocJson, TypeDefinitionByName } from '@0xproject/types'; -import compareVersions = require('compare-versions'); import * as _ from 'lodash'; import { diff --git a/packages/react-docs/tsconfig.json b/packages/react-docs/tsconfig.json index 82f44a62c..76e2cd027 100644 --- a/packages/react-docs/tsconfig.json +++ b/packages/react-docs/tsconfig.json @@ -1,9 +1,10 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "./lib/", + "outDir": "lib", + "rootDir": "src", "jsx": "react", - "baseUrl": "./", + "baseUrl": ".", "strictNullChecks": false, "paths": { "*": ["node_modules/@types/*", "*"] |