From 10320fd82e8ac87782711baea9db83914d5576fa Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 14 Dec 2022 14:55:12 +0100 Subject: [PATCH 1/2] repo-tools: remove lint rule overrides Signed-off-by: Patrik Oldsberg --- packages/repo-tools/src/commands/api-reports/api-extractor.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/repo-tools/src/commands/api-reports/api-extractor.ts b/packages/repo-tools/src/commands/api-reports/api-extractor.ts index 5ec0804ee8..e4546a0f2e 100644 --- a/packages/repo-tools/src/commands/api-reports/api-extractor.ts +++ b/packages/repo-tools/src/commands/api-reports/api-extractor.ts @@ -14,8 +14,6 @@ * limitations under the License. */ -/* eslint-disable import/no-extraneous-dependencies */ -/* eslint-disable no-restricted-imports */ import { resolve as resolvePath, relative as relativePath, From 9b1193f2772f221e3403b4339bbf277cc697dc7a Mon Sep 17 00:00:00 2001 From: Juan Pablo Garcia Ripa Date: Mon, 19 Dec 2022 23:31:08 +0100 Subject: [PATCH 2/2] add missing dependencies to repo-tools Signed-off-by: Juan Pablo Garcia Ripa --- .changeset/clean-peas-try.md | 5 +++++ packages/repo-tools/package.json | 11 +++++++++++ .../src/commands/api-reports/api-extractor.ts | 19 ++++++++++++++----- yarn.lock | 10 +++++++++- 4 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 .changeset/clean-peas-try.md diff --git a/.changeset/clean-peas-try.md b/.changeset/clean-peas-try.md new file mode 100644 index 0000000000..b18a5931e8 --- /dev/null +++ b/.changeset/clean-peas-try.md @@ -0,0 +1,5 @@ +--- +'@backstage/repo-tools': patch +--- + +declare dependencies diff --git a/packages/repo-tools/package.json b/packages/repo-tools/package.json index 595cbf1196..a5ef3006bb 100644 --- a/packages/repo-tools/package.json +++ b/packages/repo-tools/package.json @@ -37,6 +37,7 @@ "@microsoft/api-extractor": "^7.23.0", "@microsoft/api-extractor-model": "^7.17.2", "@microsoft/tsdoc": "0.14.1", + "@microsoft/tsdoc-config": "0.16.1", "chalk": "^4.0.0", "commander": "^9.1.0", "fs-extra": "10.1.0", @@ -51,6 +52,16 @@ "@types/mock-fs": "^4.13.0", "mock-fs": "^5.1.0" }, + "peerDependencies": { + "@rushstack/node-core-library": "*", + "prettier": "^2.8.1", + "typescript": "> 3.0.0" + }, + "peerDependenciesMeta": { + "prettier": { + "optional": true + } + }, "files": [ "bin", "dist/**/*.js" diff --git a/packages/repo-tools/src/commands/api-reports/api-extractor.ts b/packages/repo-tools/src/commands/api-reports/api-extractor.ts index e4546a0f2e..9e844d97c8 100644 --- a/packages/repo-tools/src/commands/api-reports/api-extractor.ts +++ b/packages/repo-tools/src/commands/api-reports/api-extractor.ts @@ -22,7 +22,7 @@ import { join, } from 'path'; import { execFile } from 'child_process'; -import prettier from 'prettier'; +import type prettierType from 'prettier'; import fs from 'fs-extra'; import { Extractor, @@ -211,10 +211,19 @@ ApiReportGenerator.generateReviewFileContent = collector, ...moreArgs, ); - return prettier.format(content, { - ...require('@spotify/prettier-config'), - parser: 'markdown', - }); + + try { + const prettier = require('prettier') as typeof prettierType; + + const config = prettier.resolveConfig.sync(cliPaths.targetRoot) ?? {}; + return prettier.format(content, { + ...config, + parser: 'markdown', + }); + } catch (e) { + // console.warn('Failed to format API report with prettier', e); + return content; + } }; export async function createTemporaryTsConfig(includedPackageDirs: string[]) { diff --git a/yarn.lock b/yarn.lock index aa82c2bf97..5cc879e997 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8512,6 +8512,7 @@ __metadata: "@microsoft/api-extractor": ^7.23.0 "@microsoft/api-extractor-model": ^7.17.2 "@microsoft/tsdoc": 0.14.1 + "@microsoft/tsdoc-config": 0.16.1 "@types/is-glob": ^4.0.2 "@types/mock-fs": ^4.13.0 chalk: ^4.0.0 @@ -8522,6 +8523,13 @@ __metadata: minimatch: ^5.1.1 mock-fs: ^5.1.0 ts-node: ^10.0.0 + peerDependencies: + "@rushstack/node-core-library": "*" + prettier: ^2.8.1 + typescript: "> 3.0.0" + peerDependenciesMeta: + prettier: + optional: true bin: backstage-repo-tools: bin/backstage-repo-tools languageName: unknown @@ -11562,7 +11570,7 @@ __metadata: languageName: node linkType: hard -"@microsoft/tsdoc-config@npm:~0.16.1": +"@microsoft/tsdoc-config@npm:0.16.1, @microsoft/tsdoc-config@npm:~0.16.1": version: 0.16.1 resolution: "@microsoft/tsdoc-config@npm:0.16.1" dependencies: