From b5629d98d83108a2bcc54c58bca68040f0554b84 Mon Sep 17 00:00:00 2001 From: Alan Date: Fri, 1 Mar 2019 08:09:46 +0100 Subject: [PATCH] fix(bazel): api extractor don't generate tsdoc metadata (#29023) tsdoc metadata is not needed for `ng_module` and with `@microsoft/api-extractor` version 7.0.21 there is a new flag to disable it's generation. See: https://github.com/Microsoft/web-build-tools/issues/1051 PR Close #29023 --- package.json | 2 +- packages/bazel/package.json | 2 +- packages/bazel/src/api-extractor/index.ts | 3 +++ yarn.lock | 18 +++++++++--------- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index ae641c65e3..b273db0db0 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@bazel/jasmine": "0.26.0", "@bazel/karma": "0.26.0", "@bazel/typescript": "0.26.0", - "@microsoft/api-extractor": "^7.0.17", + "@microsoft/api-extractor": "^7.0.21", "@schematics/angular": "^7.3.2", "@types/angular": "^1.6.47", "@types/base64-js": "1.2.5", diff --git a/packages/bazel/package.json b/packages/bazel/package.json index 8ba57c7d69..c5d758923c 100644 --- a/packages/bazel/package.json +++ b/packages/bazel/package.json @@ -22,7 +22,7 @@ "@angular-devkit/core": "^7.0.4", "@angular-devkit/schematics": "^7.3.0-rc.0", "@bazel/typescript": "^0.26.0", - "@microsoft/api-extractor": "^7.0.17", + "@microsoft/api-extractor": "^7.0.21", "@schematics/angular": "^7.0.4", "@types/node": "6.0.84", "semver": "^5.6.0", diff --git a/packages/bazel/src/api-extractor/index.ts b/packages/bazel/src/api-extractor/index.ts index c895891c96..4df9ecd8f7 100644 --- a/packages/bazel/src/api-extractor/index.ts +++ b/packages/bazel/src/api-extractor/index.ts @@ -89,6 +89,9 @@ export function runMain( enabled: !!dtsBundleOut, publishFolder: dtsBundleOut && path.resolve(path.dirname(dtsBundleOut)), mainDtsRollupPath: dtsBundleOut && path.basename(dtsBundleOut), + }, + tsdocMetadata: { + enabled: false, } }; diff --git a/yarn.lock b/yarn.lock index b39656d38e..daa9a3b540 100644 --- a/yarn.lock +++ b/yarn.lock @@ -220,12 +220,12 @@ through2 "^2.0.0" xdg-basedir "^3.0.0" -"@microsoft/api-extractor@^7.0.17": - version "7.0.17" - resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.0.17.tgz#fadb376908a57144ba4a8eb18787d6337bfe6b56" - integrity sha512-Mm+6x5/1HRAKno0vow4DyMKcVtB+b6wehMUx21huN+FSpfxID5kAEqKw9OR9XCp7YBXjiISqFBlY4dVYq/bdCw== +"@microsoft/api-extractor@^7.0.21": + version "7.0.21" + resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.0.21.tgz#d5ff9bba4ff7283503aac83ad489b16cad293fc7" + integrity sha512-7lFcHNykVz0tvgOz9juXqP+a1j0EmnJ9J080CBE/171IxL4fBrpslPhqN86dNuavuPragRpBLc8Okv/bV7FJPQ== dependencies: - "@microsoft/node-core-library" "3.10.0" + "@microsoft/node-core-library" "3.12.0" "@microsoft/ts-command-line" "4.2.3" "@microsoft/tsdoc" "0.12.5" "@types/node" "8.5.8" @@ -236,10 +236,10 @@ typescript "~3.1.6" z-schema "~3.18.3" -"@microsoft/node-core-library@3.10.0": - version "3.10.0" - resolved "https://registry.yarnpkg.com/@microsoft/node-core-library/-/node-core-library-3.10.0.tgz#70e089534d8e20f6a0f9c7a4a12a6aeafd6a1ddb" - integrity sha512-1SbU+XNYAabhV9noGXHtsUVPc5ELV+oEuJQtZQoCncbOd6WAMeTgB1xFwh96hmdEXyKQyML/pnByiKocmh/nbQ== +"@microsoft/node-core-library@3.12.0": + version "3.12.0" + resolved "https://registry.yarnpkg.com/@microsoft/node-core-library/-/node-core-library-3.12.0.tgz#f9c27b8bb6b55d60b91d4e1962f42b03b9f8f47f" + integrity sha512-9T2dEXmmxZqnqcpHuIB8mTAOM/DNSi/QcAwKYDjvZvkd+PGT5lCUXjM9GL7SaR2NPa3UrWDGgFhNoqLqLfEPbw== dependencies: "@types/fs-extra" "5.0.4" "@types/jju" "~1.4.0"