Merge branch 'master' of github.com:spotify/backstage into mob/create-vcs-step

* 'master' of github.com:spotify/backstage: (62 commits)
  chore: ref to shadowDomRef
  chore: revert data-testid back to shadow-dom
  fix: remove re-creating new shadow-dom on page change
  fix(techdocs): cleaned up useEffect in Reader
  fix: moved useEnforcingTrailingSlash upper in the hook chain
  chore(techdocs): updated tests
  fix(techdocs): fixed race condition between page loads
  fix(useFetch): use AsyncState type
  fix(techdocs-404): throw error
  fix(techdocs-home): move docs sites mock data to array
  fix(test): change to lowercase
  fix(test): remove async
  refactor(techdocs): basic techdocs not found, split out components from reader
  fix(tests): fix fixures (#1505)
  build(deps): bump css-loader from 3.5.3 to 3.6.0
  cli: never treat success as a failure in e2e test
  Fix variable
  Use Config for Filter Org List Header
  fix(sidebar): do not let sidebar items collapse and shrink
  cli: use tree-kill to kill serve task in e2e test
  ...

plugins/scaffolder-backend/src/service/router.ts

@@ -29,8 +29,8 @@ import { TemplateEntityV1alpha1 } from '@backstage/catalog-model';
 import Docker from 'dockerode';
 import {} from '@backstage/backend-common';
 import { Octokit } from '@octokit/rest';
-
 import { JsonValue } from '@backstage/config';
+
 export interface RouterOptions {
   preparers: PreparerBuilder;
   templater: TemplaterBase;