From c83c4168ca2f17b3e3de1088469380aa323f1ddd Mon Sep 17 00:00:00 2001 From: Pete Bacon Darwin Date: Fri, 26 Jan 2018 14:36:14 +0000 Subject: [PATCH] build(aio): upgrade to dgeni-packages 0.24.0 (#21802) This has two benefits: * it prepares the way for the API docs update, which need parameter docs * it doesn't incorrectly report dangling links for non-latin anchors Closes #21306 PR Close #21802 --- aio/package.json | 2 +- .../processors/filterContainedDocs.js | 2 +- .../templates/api/includes/class-overview.html | 4 ++-- .../api/includes/directive-overview.html | 2 +- .../api/includes/interface-overview.html | 2 +- .../templates/api/lib/memberHelpers.html | 2 +- aio/yarn.lock | 15 +++++++++++---- 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/aio/package.json b/aio/package.json index b83b23f518..2b6bca3119 100644 --- a/aio/package.json +++ b/aio/package.json @@ -102,7 +102,7 @@ "cross-spawn": "^5.1.0", "css-selector-parser": "^1.3.0", "dgeni": "^0.4.7", - "dgeni-packages": "0.22.1", + "dgeni-packages": "^0.24.0", "entities": "^1.1.1", "eslint": "^3.19.0", "eslint-plugin-jasmine": "^2.2.0", diff --git a/aio/tools/transforms/angular-api-package/processors/filterContainedDocs.js b/aio/tools/transforms/angular-api-package/processors/filterContainedDocs.js index 036f6bad85..79ddd6acb1 100644 --- a/aio/tools/transforms/angular-api-package/processors/filterContainedDocs.js +++ b/aio/tools/transforms/angular-api-package/processors/filterContainedDocs.js @@ -4,7 +4,7 @@ */ module.exports = function filterContainedDocs() { return { - docTypes: ['member', 'function-overload', 'get-accessor-info', 'set-accessor-info'], + docTypes: ['member', 'function-overload', 'get-accessor-info', 'set-accessor-info', 'parameter'], $runAfter: ['extra-docs-added'], $runBefore: ['computing-paths'], $process: function(docs) { diff --git a/aio/tools/transforms/templates/api/includes/class-overview.html b/aio/tools/transforms/templates/api/includes/class-overview.html index f4b8ab0fd4..e7ddf7862f 100644 --- a/aio/tools/transforms/templates/api/includes/class-overview.html +++ b/aio/tools/transforms/templates/api/includes/class-overview.html @@ -5,9 +5,9 @@ {$ doc.docType $} {$ doc.name $}{$ doc.typeParams | escape $}{$ memberHelper.renderHeritage(doc) $} { {%- if doc.constructorDoc %}{% if not doc.constructorDoc.internal %} - {$ memberHelper.renderMember(doc.constructorDoc, 1) $}{% endif %}{% endif -%} + {$ memberHelper.renderMember(doc.constructorDoc, 1) $}{% endif %}{% endif -%} {%- if doc.statics.length %}{% for member in doc.statics %}{% if not member.internal %} - {$ memberHelper.renderMember(member, 1) $}{% endif %}{% endfor %}{% endif -%} + {$ memberHelper.renderMember(member, 1) $}{% endif %}{% endfor %}{% endif -%} {$ memberHelper.renderMembers(doc) $} } diff --git a/aio/tools/transforms/templates/api/includes/directive-overview.html b/aio/tools/transforms/templates/api/includes/directive-overview.html index 642a5d503f..078f82c5ac 100644 --- a/aio/tools/transforms/templates/api/includes/directive-overview.html +++ b/aio/tools/transforms/templates/api/includes/directive-overview.html @@ -6,7 +6,7 @@ @{$ decorator.name $}({$ decorator.arguments $}){% endfor %} class {$ doc.name $}{$ doc.typeParams | escape $}{$ memberHelper.renderHeritage(doc) $} { {%- if doc.statics.length %}{% for member in doc.statics %}{% if not member.internal %} - {$ memberHelper.renderMember(member, 1) $}{% endif %}{% endfor %}{% endif -%} + {$ memberHelper.renderMember(member, 1) $}{% endif %}{% endfor %}{% endif -%} {$ memberHelper.renderMembers(doc) $} } diff --git a/aio/tools/transforms/templates/api/includes/interface-overview.html b/aio/tools/transforms/templates/api/includes/interface-overview.html index ac4d71299c..490a344cbf 100644 --- a/aio/tools/transforms/templates/api/includes/interface-overview.html +++ b/aio/tools/transforms/templates/api/includes/interface-overview.html @@ -4,7 +4,7 @@

Interface Overview

interface {$ doc.name $}{$ doc.typeParams | escape $}{$ memberHelper.renderHeritage(doc) $} { {% if doc.members.length %}{% for member in doc.members %}{% if not member.internal %} - {$ memberHelper.renderMember(member, 1) $}{% endif %}{% endfor %}{% endif %} + {$ memberHelper.renderMember(member, 1) $}{% endif %}{% endfor %}{% endif %} } \ No newline at end of file diff --git a/aio/tools/transforms/templates/api/lib/memberHelpers.html b/aio/tools/transforms/templates/api/lib/memberHelpers.html index 09a2dcb6e1..7589fb1781 100644 --- a/aio/tools/transforms/templates/api/lib/memberHelpers.html +++ b/aio/tools/transforms/templates/api/lib/memberHelpers.html @@ -11,7 +11,7 @@ {%- macro renderMembers(doc) -%} {%- if doc.members.length %}{% for member in doc.members %}{% if not member.internal %} - {$ renderMember(member, 1) $}{% endif %}{% endfor %}{% endif %} + {$ renderMember(member, 1) $}{% endif %}{% endfor %}{% endif %} {%- for ancestor in doc.extendsClauses %}{% if ancestor.doc %} // inherited from {$ ancestor.doc.id $}{$ renderMembers(ancestor.doc) $}{% endif %}{% endfor %} {%- endmacro -%} diff --git a/aio/yarn.lock b/aio/yarn.lock index b45153cbd0..81be1ebf58 100644 --- a/aio/yarn.lock +++ b/aio/yarn.lock @@ -2306,9 +2306,9 @@ devtools-timeline-model@1.1.6: chrome-devtools-frontend "1.0.401423" resolve "1.1.7" -dgeni-packages@0.22.1: - version "0.22.1" - resolved "https://registry.yarnpkg.com/dgeni-packages/-/dgeni-packages-0.22.1.tgz#c4587a765689c4c9d48ed661517ed2249403bfb2" +dgeni-packages@^0.24.0: + version "0.24.0" + resolved "https://registry.yarnpkg.com/dgeni-packages/-/dgeni-packages-0.24.0.tgz#2f995f78fecd6a9ded72d7bdccbbc4c46360c1ea" dependencies: canonical-path "0.0.2" catharsis "^0.8.1" @@ -2331,6 +2331,7 @@ dgeni-packages@0.22.1: spdx-license-list "^2.1.0" stringmap "^0.2.2" typescript "2.4" + urlencode "^1.1.0" dgeni@^0.4.7, dgeni@^0.4.9: version "0.4.9" @@ -4081,7 +4082,7 @@ iconv-lite@0.4.15: version "0.4.15" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb" -iconv-lite@0.4.19: +iconv-lite@0.4.19, iconv-lite@~0.4.11: version "0.4.19" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" @@ -8760,6 +8761,12 @@ url@^0.11.0: punycode "1.3.2" querystring "0.2.0" +urlencode@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/urlencode/-/urlencode-1.1.0.tgz#1f2ba26f013c85f0133f7a3ad6ff2730adf7cbb7" + dependencies: + iconv-lite "~0.4.11" + user-home@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"