Merge branch 'master' of github.com:backstage/backstage into blam/isomorphic-git

* 'master' of github.com:backstage/backstage: (45 commits)
  Speed up some PRs with paths-ignore
  Remove unnecessary step
  catalog: export EntitySwitch component and conditions
  Apply suggestions from code review
  changeset: add changeset for new catalog composability components
  catalog: fix EntityLayout TabbedLayout route path matching
  catalog: gather all mount points beneath EntityLayout Routes
  catalog: add EntityLayout
  Change to raw Windows Discord hook
  Release plugin-cost-insights 0.5.3
  catalog: add EntitySwitch
  catalog: export new CatalogIndexPage and CatalogEntityPage
  Create dull-seals-march.md
  core-api: add BackstageRoutes
  Fix plugin name
  fixed category lables
  feat(cost-insights): Make alert url field optional
  fossa: Add changeset
  fix(fossa): Bump core packages version to fix failing CI
  Update 2020-12-22-stability-index.md
  ...

plugins/scaffolder-backend/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @backstage/plugin-scaffolder-backend
 
+## 0.3.6
+
+### Patch Changes
+
+- 19554f6d6: Added Github Actions for Create React App, and allow better imports of files inside a module when they're exposed using `files` in `package.json`
+- 33a82a713: GitLab preparer uses the right token (primarily the same one as the publisher, falling back to the integrations token)
+- aed8f7f12: Clearer error message when preparer or publisher type can't be determined.
+
 ## 0.3.5
 
 ### Patch Changes

plugins/scaffolder-backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -58,7 +58,7 @@
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.2",
+    "@backstage/cli": "^0.4.3",
     "@octokit/types": "^5.4.1",
     "@types/fs-extra": "^9.0.1",
     "@types/git-url-parse": "^9.0.0",