Merge remote-tracking branch 'upstream/master' into master

packages/backend/CHANGELOG.md

@@ -1,5 +1,30 @@
 # example-backend
 
+## 0.2.10
+
+### Patch Changes
+
+- Updated dependencies [5eb8c9b9e]
+- Updated dependencies [7e3451700]
+  - @backstage/plugin-scaffolder-backend@0.4.0
+
+## 0.2.8
+
+### Patch Changes
+
+- 7cfcd58ee: use node 14 for backend Dockerfile
+- Updated dependencies [19554f6d6]
+- Updated dependencies [33a82a713]
+- Updated dependencies [5de26b9a6]
+- Updated dependencies [30d6c78fb]
+- Updated dependencies [5084e5039]
+- Updated dependencies [a8573e53b]
+- Updated dependencies [aed8f7f12]
+  - @backstage/plugin-scaffolder-backend@0.3.6
+  - @backstage/plugin-catalog-backend@0.5.1
+  - @backstage/plugin-techdocs-backend@0.5.0
+  - example-app@0.2.8
+
 ## 0.2.7
 
 ### Patch Changes

packages/backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12-buster
+FROM node:14-buster
 
 WORKDIR /usr/src/app
 

packages/backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.2.7",
+  "version": "0.2.10",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -32,19 +32,19 @@
     "@backstage/config": "^0.1.2",
     "@backstage/plugin-app-backend": "^0.3.3",
     "@backstage/plugin-auth-backend": "^0.2.7",
-    "@backstage/plugin-catalog-backend": "^0.5.0",
+    "@backstage/plugin-catalog-backend": "^0.5.1",
     "@backstage/plugin-graphql-backend": "^0.1.4",
     "@backstage/plugin-kubernetes-backend": "^0.2.3",
     "@backstage/plugin-kafka-backend": "^0.1.0",
     "@backstage/plugin-proxy-backend": "^0.2.3",
     "@backstage/plugin-rollbar-backend": "^0.1.5",
-    "@backstage/plugin-scaffolder-backend": "^0.3.5",
-    "@backstage/plugin-techdocs-backend": "^0.4.0",
+    "@backstage/plugin-scaffolder-backend": "^0.4.0",
+    "@backstage/plugin-techdocs-backend": "^0.5.0",
     "@gitbeaker/node": "^25.2.0",
     "@octokit/rest": "^18.0.0",
     "azure-devops-node-api": "^10.1.1",
     "dockerode": "^3.2.1",
-    "example-app": "^0.2.7",
+    "example-app": "^0.2.8",
     "express": "^4.17.1",
     "express-promise-router": "^3.0.3",
     "knex": "^0.21.6",
@@ -54,7 +54,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.2",
+    "@backstage/cli": "^0.4.3",
     "@types/dockerode": "^3.2.1",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",

packages/backend/src/plugins/techdocs.ts

@@ -15,12 +15,8 @@
  */
 import {
   createRouter,
-  DirectoryPreparer,
   Preparers,
   Generators,
-  TechdocsGenerator,
-  CommonGitPreparer,
-  UrlPreparer,
   Publisher,
 } from '@backstage/plugin-techdocs-backend';
 import { PluginEnvironment } from '../types';
@@ -33,30 +29,25 @@ export default async function createPlugin({
   reader,
 }: PluginEnvironment) {
   // Preparers are responsible for fetching source files for documentation.
-  const preparers = new Preparers();
-
-  const directoryPreparer = new DirectoryPreparer(logger);
-  preparers.register('dir', directoryPreparer);
-
-  const commonGitPreparer = new CommonGitPreparer(logger);
-  preparers.register('github', commonGitPreparer);
-  preparers.register('gitlab', commonGitPreparer);
-  preparers.register('azure/api', commonGitPreparer);
-
-  const urlPreparer = new UrlPreparer(reader, logger);
-  preparers.register('url', urlPreparer);
+  const preparers = await Preparers.fromConfig(config, {
+    logger,
+    reader,
+  });
 
   // Generators are used for generating documentation sites.
-  const generators = new Generators();
-  const techdocsGenerator = new TechdocsGenerator(logger, config);
-  generators.register('techdocs', techdocsGenerator);
+  const generators = await Generators.fromConfig(config, {
+    logger,
+  });
 
-  // Publishers are used for
+  // Publisher is used for
   // 1. Publishing generated files to storage
   // 2. Fetching files from storage and passing them to TechDocs frontend.
-  const publisher = Publisher.fromConfig(config, logger, discovery);
+  const publisher = await Publisher.fromConfig(config, {
+    logger,
+    discovery,
+  });
 
-  // Docker client used by the generators.
+  // Docker client (conditionally) used by the generators, based on techdocs.generators config.
   const dockerClient = new Docker();
 
   return await createRouter({