chore: finishg off some other api-report fixing

Signed-off-by: blam <ben@blam.sh>

plugins/search-backend-module-elasticsearch/api-report.md

@@ -10,7 +10,7 @@ import { Client } from '@elastic/elasticsearch';
 import { Config } from '@backstage/config';
 import type { ConnectionOptions } from 'tls';
 import { IndexableDocument } from '@backstage/plugin-search-common';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { SearchEngine } from '@backstage/plugin-search-common';
 import { SearchQuery } from '@backstage/plugin-search-common';
 import { SearchResultSet } from '@backstage/plugin-search-common';
@@ -104,7 +104,7 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     elasticSearchClientOptions: ElasticSearchClientOptions,
     aliasPostfix: string,
     indexPrefix: string,
-    logger: Logger_2,
+    logger: Logger,
   );
   // Warning: (ae-forgotten-export) The symbol "ElasticSearchOptions" needs to be exported by the entry point index.d.ts
   //
@@ -153,7 +153,7 @@ export type ElasticSearchSearchEngineIndexerOptions = {
   indexPrefix: string;
   indexSeparator: string;
   alias: string;
-  logger: Logger_2;
+  logger: Logger;
   elasticSearchClient: Client;
 };
 ```

plugins/search-backend-node/api-report.md

@@ -9,7 +9,7 @@ import { DocumentCollatorFactory } from '@backstage/plugin-search-common';
 import { DocumentDecoratorFactory } from '@backstage/plugin-search-common';
 import { DocumentTypeInfo } from '@backstage/plugin-search-common';
 import { IndexableDocument } from '@backstage/plugin-search-common';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { default as lunr_2 } from 'lunr';
 import { QueryTranslator } from '@backstage/plugin-search-common';
 import { Readable } from 'stream';
@@ -69,7 +69,7 @@ export class IndexBuilder {
 // @beta (undocumented)
 export type IndexBuilderOptions = {
   searchEngine: SearchEngine;
-  logger: Logger_2;
+  logger: Logger;
 };
 
 // @beta (undocumented)
@@ -77,13 +77,13 @@ export type LunrQueryTranslator = (query: SearchQuery) => ConcreteLunrQuery;
 
 // @beta (undocumented)
 export class LunrSearchEngine implements SearchEngine {
-  constructor({ logger }: { logger: Logger_2 });
+  constructor({ logger }: { logger: Logger });
   // (undocumented)
   protected docStore: Record<string, IndexableDocument>;
   // (undocumented)
   getIndexer(type: string): Promise<LunrSearchEngineIndexer>;
   // (undocumented)
-  protected logger: Logger_2;
+  protected logger: Logger;
   // (undocumented)
   protected lunrIndices: Record<string, lunr_2.Index>;
   // (undocumented)
@@ -122,7 +122,7 @@ export interface RegisterDecoratorParameters {
 
 // @beta (undocumented)
 export class Scheduler {
-  constructor({ logger }: { logger: Logger_2 });
+  constructor({ logger }: { logger: Logger });
   addToSchedule(task: Function, interval: number): void;
   start(): void;
   stop(): void;

plugins/techdocs-node/api-report.md

@@ -11,7 +11,7 @@ import { ContainerRunner } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
 import express from 'express';
 import { IndexableDocument } from '@backstage/plugin-search-common';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { UrlReader } from '@backstage/backend-common';
@@ -20,7 +20,7 @@ import { Writable } from 'stream';
 // @public
 export class DirectoryPreparer implements PreparerBase {
   // @deprecated
-  constructor(config: Config, _logger: Logger_2 | null, reader: UrlReader);
+  constructor(config: Config, _logger: Logger | null, reader: UrlReader);
   static fromConfig(
     config: Config,
     { logger, reader }: PreparerConfig,
@@ -45,7 +45,7 @@ export type GeneratorBuilder = {
 // @public
 export type GeneratorOptions = {
   containerRunner: ContainerRunner;
-  logger: Logger_2;
+  logger: Logger;
 };
 
 // @public
@@ -54,7 +54,7 @@ export type GeneratorRunOptions = {
   outputDir: string;
   parsedLocationAnnotation?: ParsedLocationAnnotation;
   etag?: string;
-  logger: Logger_2;
+  logger: Logger;
   logStream?: Writable;
 };
 
@@ -63,7 +63,7 @@ export class Generators implements GeneratorBuilder {
   static fromConfig(
     config: Config,
     options: {
-      logger: Logger_2;
+      logger: Logger;
       containerRunner: ContainerRunner;
     },
   ): Promise<GeneratorBuilder>;
@@ -78,7 +78,7 @@ export const getDocFilesFromRepository: (
   opts?:
     | {
         etag?: string | undefined;
-        logger?: Logger_2 | undefined;
+        logger?: Logger | undefined;
       }
     | undefined,
 ) => Promise<PreparerResponse>;
@@ -120,13 +120,13 @@ export type PreparerBuilder = {
 
 // @public
 export type PreparerConfig = {
-  logger: Logger_2;
+  logger: Logger;
   reader: UrlReader;
 };
 
 // @public
 export type PreparerOptions = {
-  logger?: Logger_2;
+  logger?: Logger;
   etag?: ETag;
 };
 
@@ -168,7 +168,7 @@ export interface PublisherBase {
 
 // @public
 export type PublisherFactory = {
-  logger: Logger_2;
+  logger: Logger;
   discovery: PluginEndpointDiscovery;
 };
 
@@ -216,7 +216,7 @@ export interface TechDocsDocument extends IndexableDocument {
 // @public
 export class TechdocsGenerator implements GeneratorBase {
   constructor(options: {
-    logger: Logger_2;
+    logger: Logger;
     containerRunner: ContainerRunner;
     config: Config;
     scmIntegrations: ScmIntegrationRegistry;
@@ -251,7 +251,7 @@ export const transformDirLocation: (
 // @public
 export class UrlPreparer implements PreparerBase {
   // @deprecated
-  constructor(reader: UrlReader, logger: Logger_2);
+  constructor(reader: UrlReader, logger: Logger);
   static fromConfig({ reader, logger }: PreparerConfig): UrlPreparer;
   prepare(entity: Entity, options?: PreparerOptions): Promise<PreparerResponse>;
 }

yarn.lock

@@ -13539,7 +13539,7 @@ handle-thing@^2.0.0:
   resolved "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
-handlebars@^4.7.3, handlebars@^4.7.6, handlebars@^4.7.7:
+handlebars@^4.7.3, handlebars@^4.7.7:
   version "4.7.7"
   resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
   integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==