From 0577ab96b8056b05dca1024227af53dad4ef5322 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 23 Aug 2018 14:29:22 +0100
Subject: Upgrade Typedoc to 0.12.0, which works with TS 3.x
---
packages/0x.js/package.json | 2 +-
packages/connect/package.json | 2 +-
packages/contract-wrappers/package.json | 2 +-
packages/json-schemas/package.json | 2 +-
packages/monorepo-scripts/package.json | 2 +-
packages/order-utils/package.json | 2 +-
packages/sol-compiler/package.json | 2 +-
packages/sol-cov/package.json | 2 +-
packages/subproviders/package.json | 2 +-
packages/web3-wrapper/package.json | 2 +-
yarn.lock | 92 ++++++++++++++++-----------------
11 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index af1e47cd8..755de9e18 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -68,7 +68,7 @@
"sinon": "^4.0.0",
"source-map-support": "^0.5.0",
"tslint": "5.11.0",
- "typedoc": "0xProject/typedoc",
+ "typedoc": "0.12.0",
"typescript": "3.0.1",
"webpack": "^3.1.0"
},
diff --git a/packages/connect/package.json b/packages/connect/package.json
index 13326df9b..f5772cf4d 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -76,7 +76,7 @@
"nyc": "^11.0.1",
"shx": "^0.2.2",
"tslint": "5.11.0",
- "typedoc": "0xProject/typedoc",
+ "typedoc": "0.12.0",
"typescript": "3.0.1"
},
"publishConfig": {
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index f8477e878..67cca9ec0 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -69,7 +69,7 @@
"sinon": "^4.0.0",
"source-map-support": "^0.5.0",
"tslint": "5.11.0",
- "typedoc": "0xProject/typedoc",
+ "typedoc": "0.12.0",
"typescript": "3.0.1",
"web3-provider-engine": "14.0.6"
},
diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json
index 3434c9eb1..c67d15d6c 100644
--- a/packages/json-schemas/package.json
+++ b/packages/json-schemas/package.json
@@ -58,7 +58,7 @@
"nyc": "^11.0.1",
"shx": "^0.2.2",
"tslint": "5.11.0",
- "typedoc": "0xProject/typedoc",
+ "typedoc": "0.12.0",
"typescript": "3.0.1"
},
"publishConfig": {
diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json
index 74be99550..551695129 100644
--- a/packages/monorepo-scripts/package.json
+++ b/packages/monorepo-scripts/package.json
@@ -65,7 +65,7 @@
"semver": "5.5.0",
"semver-diff": "^2.1.0",
"semver-sort": "0.0.4",
- "typedoc": "0xProject/typedoc",
+ "typedoc": "0.12.0",
"yargs": "^10.0.3"
},
"publishConfig": {
diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index dbccded86..0d82affef 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -55,7 +55,7 @@
"shx": "^0.2.2",
"sinon": "^4.0.0",
"tslint": "5.11.0",
- "typedoc": "0xProject/typedoc",
+ "typedoc": "0.12.0",
"typescript": "3.0.1"
},
"dependencies": {
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index e13a28efa..ee7dffe30 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -58,7 +58,7 @@
"nyc": "^11.0.1",
"shx": "^0.2.2",
"tslint": "5.11.0",
- "typedoc": "0xProject/typedoc",
+ "typedoc": "0.12.0",
"types-bn": "^0.0.1",
"typescript": "3.0.1",
"web3-typescript-typings": "^0.10.2",
diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json
index a6c383b6f..2bf09e63a 100644
--- a/packages/sol-cov/package.json
+++ b/packages/sol-cov/package.json
@@ -76,7 +76,7 @@
"shx": "^0.2.2",
"sinon": "^4.0.0",
"tslint": "5.11.0",
- "typedoc": "0xProject/typedoc",
+ "typedoc": "0.12.0",
"typescript": "3.0.1"
},
"publishConfig": {
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 38b99c976..521785998 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -71,7 +71,7 @@
"shx": "^0.2.2",
"sinon": "^4.0.0",
"tslint": "5.11.0",
- "typedoc": "0xProject/typedoc",
+ "typedoc": "0.12.0",
"typescript": "3.0.1",
"webpack": "^3.1.0"
},
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index d584db453..3b347ac6f 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -49,7 +49,7 @@
"nyc": "^11.0.1",
"shx": "^0.2.2",
"tslint": "5.11.0",
- "typedoc": "0xProject/typedoc",
+ "typedoc": "0.12.0",
"typescript": "3.0.1"
},
"dependencies": {
diff --git a/yarn.lock b/yarn.lock
index 8d5a8ad20..06be65d8a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -966,9 +966,9 @@
version "2.0.0"
resolved "https://registry.yarnpkg.com/@types/find-versions/-/find-versions-2.0.0.tgz#a976ca032ab8dd1161116604eded0620d2b85df2"
-"@types/fs-extra@5.0.0":
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.0.tgz#d3e225b35eb5c6d3a5a782c28219df365c781413"
+"@types/fs-extra@^5.0.3":
+ version "5.0.4"
+ resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.4.tgz#b971134d162cc0497d221adde3dbb67502225599"
dependencies:
"@types/node" "*"
@@ -980,23 +980,23 @@
"@types/minimatch" "*"
"@types/node" "*"
-"@types/handlebars@4.0.36":
- version "4.0.36"
- resolved "https://registry.yarnpkg.com/@types/handlebars/-/handlebars-4.0.36.tgz#ff57c77fa1ab6713bb446534ddc4d979707a3a79"
-
"@types/handlebars@^4.0.36":
version "4.0.37"
resolved "https://registry.yarnpkg.com/@types/handlebars/-/handlebars-4.0.37.tgz#a3bc3eba0c0f03f753cac00841a5b21e26a02c03"
+"@types/handlebars@^4.0.38":
+ version "4.0.39"
+ resolved "https://registry.yarnpkg.com/@types/handlebars/-/handlebars-4.0.39.tgz#961fb54db68030890942e6aeffe9f93a957807bd"
+
"@types/hdkey@^0.7.0":
version "0.7.0"
resolved "https://registry.yarnpkg.com/@types/hdkey/-/hdkey-0.7.0.tgz#6734d138e3c597f241be8fae2e60c2949bc3af87"
dependencies:
"@types/node" "*"
-"@types/highlight.js@9.12.2":
- version "9.12.2"
- resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.12.2.tgz#6ee7cd395effe5ec80b515d3ff1699068cd0cd1d"
+"@types/highlight.js@^9.12.3":
+ version "9.12.3"
+ resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.12.3.tgz#b672cfaac25cbbc634a0fd92c515f66faa18dbca"
"@types/history@*":
version "4.6.2"
@@ -1040,17 +1040,17 @@
version "4.14.104"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.104.tgz#53ee2357fa2e6e68379341d92eb2ecea4b11bb80"
-"@types/lodash@4.14.99":
- version "4.14.99"
- resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.99.tgz#e6e10c0a4cc16c7409b3181f1e66880d2fb7d4dc"
+"@types/lodash@^4.14.110":
+ version "4.14.116"
+ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.116.tgz#5ccf215653e3e8c786a58390751033a9adca0eb9"
"@types/loglevel@^1.5.3":
version "1.5.3"
resolved "https://registry.yarnpkg.com/@types/loglevel/-/loglevel-1.5.3.tgz#adfce55383edc5998a2170ad581b3e23d6adb5b8"
-"@types/marked@0.3.0":
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.3.0.tgz#583c223dd33385a1dda01aaf77b0cd0411c4b524"
+"@types/marked@^0.4.0":
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.4.0.tgz#057a6165703e7419217f8ffc6887747f980b6315"
"@types/material-ui@0.18.0":
version "0.18.0"
@@ -1228,9 +1228,9 @@
"@types/express-serve-static-core" "*"
"@types/mime" "*"
-"@types/shelljs@0.7.7":
- version "0.7.7"
- resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.7.tgz#1f7bfa28947661afea06365db9b1135bbc903ec4"
+"@types/shelljs@^0.8.0":
+ version "0.8.0"
+ resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.0.tgz#0caa56b68baae4f68f44e0dd666ab30b098e3632"
dependencies:
"@types/glob" "*"
"@types/node" "*"
@@ -5935,6 +5935,14 @@ fs-extra@^5.0.0:
jsonfile "^4.0.0"
universalify "^0.1.0"
+fs-extra@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
+ dependencies:
+ graceful-fs "^4.1.2"
+ jsonfile "^4.0.0"
+ universalify "^0.1.0"
+
fs-minipass@^1.2.5:
version "1.2.5"
resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
@@ -8658,9 +8666,9 @@ marked@0.3.18:
version "0.3.18"
resolved "https://registry.npmjs.org/marked/-/marked-0.3.18.tgz#3ef058cd926101849b92a7a7c15db18c7fc76b2f"
-marked@^0.3.12:
- version "0.3.19"
- resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790"
+marked@^0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/marked/-/marked-0.4.0.tgz#9ad2c2a7a1791f10a852e0112f77b571dce10c66"
material-ui@0.17.4, material-ui@^0.17.1:
version "0.17.4"
@@ -12325,7 +12333,7 @@ shelljs@^0.7.3:
interpret "^1.0.0"
rechoir "^0.6.2"
-shelljs@^0.8.0:
+shelljs@^0.8.0, shelljs@^0.8.2:
version "0.8.2"
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
dependencies:
@@ -12333,14 +12341,6 @@ shelljs@^0.8.0:
interpret "^1.0.0"
rechoir "^0.6.2"
-shelljs@^0.8.1:
- version "0.8.1"
- resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.1.tgz#729e038c413a2254c4078b95ed46e0397154a9f1"
- dependencies:
- glob "^7.0.0"
- interpret "^1.0.0"
- rechoir "^0.6.2"
-
shx@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/shx/-/shx-0.2.2.tgz#0a304d020b0edf1306ad81570e80f0346df58a39"
@@ -13687,27 +13687,27 @@ typedoc-default-themes@^0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/typedoc-default-themes/-/typedoc-default-themes-0.5.0.tgz#6dc2433e78ed8bea8e887a3acde2f31785bd6227"
-typedoc@0xProject/typedoc:
- version "0.10.0"
- resolved "https://codeload.github.com/0xProject/typedoc/tar.gz/a9970a52f0924fec2df608abe30ff81153b3def2"
+typedoc@0.12.0:
+ version "0.12.0"
+ resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.12.0.tgz#c5d606f52af29d841658e18d9faa1a72acf0e270"
dependencies:
- "@types/fs-extra" "5.0.0"
- "@types/handlebars" "4.0.36"
- "@types/highlight.js" "9.12.2"
- "@types/lodash" "4.14.99"
- "@types/marked" "0.3.0"
+ "@types/fs-extra" "^5.0.3"
+ "@types/handlebars" "^4.0.38"
+ "@types/highlight.js" "^9.12.3"
+ "@types/lodash" "^4.14.110"
+ "@types/marked" "^0.4.0"
"@types/minimatch" "3.0.3"
- "@types/shelljs" "0.7.7"
- fs-extra "^5.0.0"
+ "@types/shelljs" "^0.8.0"
+ fs-extra "^7.0.0"
handlebars "^4.0.6"
highlight.js "^9.0.0"
- lodash "^4.13.1"
- marked "^0.3.12"
+ lodash "^4.17.10"
+ marked "^0.4.0"
minimatch "^3.0.0"
progress "^2.0.0"
- shelljs "^0.8.1"
+ shelljs "^0.8.2"
typedoc-default-themes "^0.5.0"
- typescript "2.7.1"
+ typescript "3.0.x"
types-bn@^0.0.1:
version "0.0.1"
@@ -13719,7 +13719,7 @@ typescript@2.7.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.1.tgz#bb3682c2c791ac90e7c6210b26478a8da085c359"
-typescript@3.0.1:
+typescript@3.0.1, typescript@3.0.x:
version "3.0.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.1.tgz#43738f29585d3a87575520a4b93ab6026ef11fdb"
--
cgit v1.2.3