Merge branch 'master' into mobile-sidebar

packages/create-app/README.md

@@ -22,4 +22,4 @@ yarn backstage-create-app
 ## Documentation
 
 - [Backstage Readme](https://github.com/backstage/backstage/blob/master/README.md)
-- [Backstage Documentation](https://github.com/backstage/backstage/blob/master/docs/README.md)
+- [Backstage Documentation](https://backstage.io/docs/)

packages/create-app/src/createApp.ts

@@ -65,7 +65,7 @@ export default async (cmd: Command, version: string): Promise<void> => {
   const templateDir = paths.resolveOwn('templates/default-app');
   const tempDir = resolvePath(os.tmpdir(), answers.name);
 
-  // Use `--path` argument as applicaiton directory when specified, otherwise
+  // Use `--path` argument as application directory when specified, otherwise
   // create a directory using `answers.name`
   const appDir = cmd.path
     ? resolvePath(paths.targetDir, cmd.path)

packages/create-app/templates/default-app/app-config.yaml.hbs

@@ -77,9 +77,7 @@ auth:
   providers: {}
 
 scaffolder:
-  github:
-    token: ${GITHUB_TOKEN}
-    visibility: public # or 'internal' or 'private'
+  # see https://backstage.io/docs/features/software-templates/configuration for software template options
 
 catalog:
   rules:

packages/create-app/templates/default-app/package.json.hbs

@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "^{{version '@backstage/cli'}}",
-    "@spotify/prettier-config": "^11.0.0",
+    "@spotify/prettier-config": "^12.0.0",
     "concurrently": "^6.0.0",
     "lerna": "^4.0.0",
     "prettier": "^2.3.2"

packages/create-app/templates/default-app/packages/app/package.json.hbs

@@ -22,7 +22,6 @@
     "@backstage/plugin-tech-radar": "^{{version '@backstage/plugin-tech-radar'}}",
     "@backstage/plugin-techdocs": "^{{version '@backstage/plugin-techdocs'}}",
     "@backstage/plugin-user-settings": "^{{version '@backstage/plugin-user-settings'}}",
-    "@backstage/test-utils": "^{{version '@backstage/test-utils'}}",
     "@backstage/theme": "^{{version '@backstage/theme'}}",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -34,6 +33,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
+    "@backstage/test-utils": "^{{version '@backstage/test-utils'}}",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
@@ -48,11 +48,11 @@
   "scripts": {
     "start": "backstage-cli app:serve",
     "build": "backstage-cli app:build",
-    "test": "backstage-cli test",
-    "lint": "backstage-cli lint",
     "clean": "backstage-cli clean",
+    "test": "backstage-cli test",
     "test:e2e": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:dev",
     "test:e2e:ci": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:run",
+    "lint": "backstage-cli lint",
     "cy:dev": "cypress open",
     "cy:run": "cypress run"
   },

packages/create-app/templates/default-app/packages/backend/src/plugins/techdocs.ts

@@ -14,6 +14,7 @@ export default async function createPlugin({
   config,
   discovery,
   reader,
+  cache,
 }: PluginEnvironment): Promise<Router> {
   // Preparers are responsible for fetching source files for documentation.
   const preparers = await Preparers.fromConfig(config, {
@@ -49,5 +50,6 @@ export default async function createPlugin({
     logger,
     config,
     discovery,
+    cache,
   });
 }