Skip to content

Commit 59af13f

Browse files
styustyu
committed
Upgrade typescript, swap typedoc dep
1 parent 374a3a9 commit 59af13f

File tree

9 files changed

+61
-100
lines changed

9 files changed

+61
-100
lines changed

‎packages/client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"devDependencies": {
1414
"tslint": "^5.15.0",
15-
"typescript": "~3.3.4000"
15+
"typescript": "~3.5.2"
1616
},
1717
"engines": {
1818
"node": ">=8.15.1"

‎packages/compiler/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"js-yaml": "^3.12.0",
2424
"kss": "^3.0.0-beta.25",
2525
"marked": "^0.7.0",
26-
"typedoc": "^0.15.0-0",
26+
"@gerrit0/typedoc": "^0.15.2",
2727
"yargs": "^12.0.2"
2828
},
2929
"devDependencies": {
@@ -40,7 +40,7 @@
4040
"ts-jest": "^23.10.3",
4141
"ts-node": "^7.0.1",
4242
"tslint": "^5.15.0",
43-
"typescript": "~3.3.4000"
43+
"typescript": "~3.5.2"
4444
},
4545
"engines": {
4646
"node": ">=8.15.1"

‎packages/compiler/src/documentalist.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ export class Documentalist<T> {
119119
*/
120120
private mergeInto(destination: T, source: T) {
121121
for (const key in source) {
122-
if (source.hasOwnProperty(key)) {
123-
if (destination.hasOwnProperty(key)) {
122+
if (source[key] != null) {
123+
if (destination[key] != null) {
124124
console.warn(`WARNING: Duplicate plugin key "${key}". Your plugins are overwriting each other.`);
125125
}
126126
destination[key] = source[key];

‎packages/compiler/src/plugins/typescript/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import { ICompiler, IFile, IPlugin, ITypescriptPluginData } from "@documentalist/client";
18-
import { Application } from "typedoc";
18+
import { Application } from "@gerrit0/typedoc";
1919
import { Visitor } from "./visitor";
2020

2121
export { ITypescriptPluginData };

‎packages/compiler/src/plugins/typescript/typestring.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { SignatureReflection } from "typedoc";
17+
import { SignatureReflection } from "@gerrit0/typedoc";
1818
import {
1919
IntersectionType,
2020
ReferenceType,
2121
ReflectionKind,
2222
ReflectionType,
2323
Type,
2424
UnionType,
25-
} from "typedoc/dist/lib/models";
25+
} from "@gerrit0/typedoc/dist/lib/models";
2626

2727
export function resolveTypeString(type: Type | undefined): string {
2828
if (type instanceof ReflectionType) {

‎packages/compiler/src/plugins/typescript/visitor.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ import {
3030
ITsTypeAlias,
3131
Kind,
3232
} from "@documentalist/client";
33-
import { relative } from "path";
3433
import {
3534
DeclarationReflection,
3635
ParameterReflection,
3736
ProjectReflection,
3837
Reflection,
3938
ReflectionKind,
4039
SignatureReflection,
41-
} from "typedoc";
42-
import { Comment, UnionType } from "typedoc/dist/lib/models";
43-
import { DefaultValueContainer } from "typedoc/dist/lib/models/reflections/abstract";
40+
} from "@gerrit0/typedoc";
41+
import { Comment, UnionType } from "@gerrit0/typedoc/dist/lib/models";
42+
import { DefaultValueContainer } from "@gerrit0/typedoc/dist/lib/models/reflections/abstract";
43+
import { relative } from "path";
4444
import { ITypescriptPluginOptions } from "./index";
4545
import { resolveSignature, resolveTypeString } from "./typestring";
4646

‎packages/docs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"npm-run-all": "^4.1.2",
2121
"pug-cli": "^1.0.0-alpha6",
2222
"tslint": "^5.15.0",
23-
"typescript": "~3.3.4000"
23+
"typescript": "~3.5.2"
2424
},
2525
"engines": {
2626
"node": ">=8.15.1"

‎tslint.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
]
1111
},
1212
"no-submodule-imports": {
13-
"options": ["typedoc/dist/lib/models"]
13+
"options": ["@gerrit0/typedoc/dist/lib/models"]
1414
}
1515
},
1616
"jsRules": {

‎yarn.lock

+47-86
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,33 @@
2222
tslint-plugin-prettier "^2.0.1"
2323
tslint-react "^3.6.0"
2424

25+
"@gerrit0/typedoc-default-themes@^0.6.0":
26+
version "0.6.0"
27+
resolved "https://registry.npmjs.org/@gerrit0/typedoc-default-themes/-/typedoc-default-themes-0.6.0.tgz#40f71cd36be75a0a8550e43b3eae51326767e77d"
28+
integrity sha512-FVLlZX1hP3ONLTnvldbiK0ApP+uNjG0vw2qtIQChxodjhbvkL2mC6DVrfUwnCd+ruQa1U1RliyAzjDZPYEjRfw==
29+
dependencies:
30+
backbone "^1.4.0"
31+
jquery "^3.4.1"
32+
lunr "^2.3.6"
33+
underscore "^1.9.1"
34+
35+
"@gerrit0/typedoc@^0.15.2":
36+
version "0.15.2"
37+
resolved "https://registry.npmjs.org/@gerrit0/typedoc/-/typedoc-0.15.2.tgz#08121eed2f72cafa7b40d6677aff08541b025a9d"
38+
integrity sha512-XnLYUGvjE9gjjXFg9cCrWeLWxOzcdox2ULKitsPVsJXawVdKS8mSUdQ7TbYvO2+ObFq/qFkTtIz6vBCtw4/i+g==
39+
dependencies:
40+
"@gerrit0/typedoc-default-themes" "^0.6.0"
41+
"@types/minimatch" "3.0.3"
42+
fs-extra "^7.0.1"
43+
handlebars "^4.1.2"
44+
highlight.js "^9.13.1"
45+
lodash "^4.17.11"
46+
marked "^0.6.2"
47+
minimatch "^3.0.0"
48+
progress "^2.0.3"
49+
shelljs "^0.8.3"
50+
typescript "3.5.x"
51+
2552
"@lerna/[email protected]":
2653
version "3.13.1"
2754
resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.13.1.tgz#2cd7838857edb3b43ed73e3c21f69a20beb9b702"
@@ -706,14 +733,7 @@
706733
resolved "https://registry.yarnpkg.com/@types/events/-/events-1.1.0.tgz#93b1be91f63c184450385272c47b6496fd028e02"
707734
integrity sha512-y3bR98mzYOo0pAZuiLari+cQyiKk3UXRuT45h1RjhfeCzqkjaVsfZJNaxdgtk7/3tzOm1ozLTqEqMP3VbI48jw==
708735

709-
"@types/fs-extra@^5.0.5":
710-
version "5.0.5"
711-
resolved "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.0.5.tgz#080d90a792f3fa2c5559eb44bd8ef840aae9104b"
712-
integrity sha512-w7iqhDH9mN8eLClQOYTkhdYUOSpp25eXxfc6VbFOGtzxW34JcvctH2bKjj4jD4++z4R5iO5D+pg48W2e03I65A==
713-
dependencies:
714-
"@types/node" "*"
715-
716-
"@types/glob@*", "@types/glob@^7.1.1":
736+
"@types/glob@^7.1.1":
717737
version "7.1.1"
718738
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
719739
integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
@@ -722,11 +742,6 @@
722742
"@types/minimatch" "*"
723743
"@types/node" "*"
724744

725-
"@types/highlight.js@^9.12.3":
726-
version "9.12.3"
727-
resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.12.3.tgz#b672cfaac25cbbc634a0fd92c515f66faa18dbca"
728-
integrity sha512-pGF/zvYOACZ/gLGWdQH8zSwteQS1epp68yRcVLJMgUck/MjEn/FBYmPub9pXT8C1e4a8YZfHo1CKyV8q1vKUnQ==
729-
730745
"@types/jest-diff@*":
731746
version "20.0.1"
732747
resolved "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-20.0.1.tgz#35cc15b9c4f30a18ef21852e255fdb02f6d59b89"
@@ -749,12 +764,7 @@
749764
resolved "https://registry.yarnpkg.com/@types/kss/-/kss-3.0.1.tgz#e302e9b844454671c5c679d235a4a9fe10abd4b9"
750765
integrity sha512-q3JUq12ansjW8gK03C69OXKkJ8LsakYlnn3/0B3D6MPR2T2Saf+iXKZcfWgKTgZmPeV+y7tkS8GjcBI9lESnFQ==
751766

752-
"@types/lodash@^4.14.123":
753-
version "4.14.123"
754-
resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.123.tgz#39be5d211478c8dd3bdae98ee75bb7efe4abfe4d"
755-
integrity sha512-pQvPkc4Nltyx7G1Ww45OjVqUsJP4UsZm+GWJpigXgkikZqJgRm4c48g027o6tdgubWHwFRF15iFd+Y4Pmqv6+Q==
756-
757-
"@types/marked@^0.6.0", "@types/marked@^0.6.5":
767+
"@types/marked@^0.6.5":
758768
version "0.6.5"
759769
resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.6.5.tgz#3cf2a56ef615dad24aaf99784ef90a9eba4e29d8"
760770
integrity sha512-6kBKf64aVfx93UJrcyEZ+OBM5nGv4RLsI6sR1Ar34bpgvGVRoyTgpxn4ZmtxOM5aDTAaaznYuYUH8bUX3Nk3YA==
@@ -769,14 +779,6 @@
769779
resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.2.tgz#dc85dde46aa8740bb4aed54b8104250f8f849503"
770780
integrity sha512-HOtU5KqROKT7qX/itKHuTtt5fV0iXbheQvrgbLNXFJQBY/eh+VS5vmmTAVlo3qIGMsypm0G4N1t2AXjy1ZicaQ==
771781

772-
"@types/shelljs@^0.8.3":
773-
version "0.8.5"
774-
resolved "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.5.tgz#1e507b2f6d1f893269bd3e851ec24419ef9beeea"
775-
integrity sha512-bZgjwIWu9gHCjirKJoOlLzGi5N0QgZ5t7EXEuoqyWCHTuSddURXo3FOBYDyRPNOWzZ6NbkLvZnVkn483Y/tvcQ==
776-
dependencies:
777-
"@types/glob" "*"
778-
"@types/node" "*"
779-
780782
"@types/yargs-parser@*":
781783
version "13.0.0"
782784
resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0"
@@ -1266,7 +1268,7 @@ babylon@^6.18.0:
12661268
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
12671269
integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
12681270

1269-
backbone@^1.1.2:
1271+
backbone@^1.4.0:
12701272
version "1.4.0"
12711273
resolved "https://registry.npmjs.org/backbone/-/backbone-1.4.0.tgz#54db4de9df7c3811c3f032f34749a4cd27f3bd12"
12721274
integrity sha512-RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ==
@@ -2608,16 +2610,7 @@ from2@^2.1.0:
26082610
inherits "^2.0.1"
26092611
readable-stream "^2.0.0"
26102612

2611-
fs-extra@^7.0.0:
2612-
version "7.0.0"
2613-
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
2614-
integrity sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==
2615-
dependencies:
2616-
graceful-fs "^4.1.2"
2617-
jsonfile "^4.0.0"
2618-
universalify "^0.1.0"
2619-
2620-
fs-extra@^7.0.1:
2613+
fs-extra@^7.0.0, fs-extra@^7.0.1:
26212614
version "7.0.1"
26222615
resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
26232616
integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
@@ -2887,10 +2880,10 @@ growly@^1.3.0:
28872880
resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
28882881
integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
28892882

2890-
handlebars@^4.0.0, handlebars@^4.0.3, handlebars@^4.1.0:
2891-
version "4.1.1"
2892-
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.1.tgz#6e4e41c18ebe7719ae4d38e5aca3d32fa3dd23d3"
2893-
integrity sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==
2883+
handlebars@^4.0.0, handlebars@^4.0.3, handlebars@^4.1.0, handlebars@^4.1.2:
2884+
version "4.1.2"
2885+
resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
2886+
integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
28942887
dependencies:
28952888
neo-async "^2.6.0"
28962889
optimist "^0.6.1"
@@ -3893,10 +3886,10 @@ jest@^23.6.0:
38933886
import-local "^1.0.0"
38943887
jest-cli "^23.6.0"
38953888

3896-
jquery@^2.2.4:
3897-
version "2.2.4"
3898-
resolved "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
3899-
integrity sha1-LInWiJterFIqfuoywUUhVZxsvwI=
3889+
jquery@^3.4.1:
3890+
version "3.4.1"
3891+
resolved "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
3892+
integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
39003893

39013894
js-stringify@^1.0.1:
39023895
version "1.0.2"
@@ -4379,10 +4372,10 @@ markdown-it@^8.4.1:
43794372
mdurl "^1.0.1"
43804373
uc.micro "^1.0.5"
43814374

4382-
marked@^0.6.0:
4383-
version "0.6.2"
4384-
resolved "https://registry.npmjs.org/marked/-/marked-0.6.2.tgz#c574be8b545a8b48641456ca1dbe0e37b6dccc1a"
4385-
integrity sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==
4375+
marked@^0.6.2:
4376+
version "0.6.3"
4377+
resolved "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz#79babad78af638ba4d522a9e715cdfdd2429e946"
4378+
integrity sha512-Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ==
43864379

43874380
marked@^0.7.0:
43884381
version "0.7.0"
@@ -6728,42 +6721,10 @@ typedarray@^0.0.6:
67286721
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
67296722
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
67306723

6731-
typedoc-default-themes@^0.6.0-0:
6732-
version "0.6.0-0"
6733-
resolved "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.6.0-0.tgz#a4867eaf91fb7888efd01680f1328b72e8a33640"
6734-
integrity sha512-O7hBMS1yBCozvVUntIIdlBk04WiqM+f6NOEc9p+LimJSFKJMF66cgzejeiybuTk6mgbMJW+olg42BNYC8E9x9Q==
6735-
dependencies:
6736-
backbone "^1.1.2"
6737-
jquery "^2.2.4"
6738-
lunr "^2.3.6"
6739-
underscore "^1.9.1"
6740-
6741-
typedoc@^0.15.0-0:
6742-
version "0.15.0-0"
6743-
resolved "https://registry.npmjs.org/typedoc/-/typedoc-0.15.0-0.tgz#4d0acd8697c22824fb51fff68766fd435b99163d"
6744-
integrity sha512-N43CSq6T22MVrP1kb0OYusgwnUniwuh9vGVmtgTCjvTSkuJjdMyMeJPMfnugmfRIWxuP9pO6wvNhdDRG32+EQA==
6745-
dependencies:
6746-
"@types/fs-extra" "^5.0.5"
6747-
"@types/highlight.js" "^9.12.3"
6748-
"@types/lodash" "^4.14.123"
6749-
"@types/marked" "^0.6.0"
6750-
"@types/minimatch" "3.0.3"
6751-
"@types/shelljs" "^0.8.3"
6752-
fs-extra "^7.0.1"
6753-
handlebars "^4.1.0"
6754-
highlight.js "^9.13.1"
6755-
lodash "^4.17.11"
6756-
marked "^0.6.0"
6757-
minimatch "^3.0.0"
6758-
progress "^2.0.3"
6759-
shelljs "^0.8.3"
6760-
typedoc-default-themes "^0.6.0-0"
6761-
typescript "3.3.x"
6762-
6763-
[email protected], typescript@~3.3.4000:
6764-
version "3.3.4000"
6765-
resolved "https://registry.npmjs.org/typescript/-/typescript-3.3.4000.tgz#76b0f89cfdbf97827e1112d64f283f1151d6adf0"
6766-
integrity sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==
6724+
[email protected], typescript@~3.5.2:
6725+
version "3.5.2"
6726+
resolved "https://registry.npmjs.org/typescript/-/typescript-3.5.2.tgz#a09e1dc69bc9551cadf17dba10ee42cf55e5d56c"
6727+
integrity sha512-7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA==
67676728

67686729
uc.micro@^1.0.1, uc.micro@^1.0.5:
67696730
version "1.0.6"

0 commit comments

Comments
 (0)